--- trunk/mkinitrd-magellan/livecd/mkinitrd-livecd.in	2009/08/04 19:55:41	893
+++ trunk/mkinitrd-magellan/livecd/mkinitrd-livecd.in	2009/08/05 16:24:23	894
@@ -299,7 +299,7 @@
 [[ ! -e ${LINUXRC} ]] && die "linuxrc '${LINUXRC}' not found."
 
 # create basic filesystem layout
-install -d ${DEST}/{bin,dev,etc,lib,loopfs,proc,sbin,sys,sysroot} || die
+install -d ${DEST}/{bin,dev,etc,lib,loopfs,proc,sbin,sys,sysroot,usr/bin,usr/sbin} || die
 
 # install busybox
 echo "$(which busybox.mkinitrd)"
@@ -319,8 +319,7 @@
 # sbin related
 for i in chroot init losetup modprobe pivot_root
 do
-	# static links
-	ln ${DEST}/bin/busybox ${DEST}/sbin/${i} || die "${i}"
+	ln -s ${DEST}/bin/busybox ${DEST}/sbin/${i} || die "${i}"
 done
 
 # install run-init
@@ -328,19 +327,19 @@
 install -m0755 $(which run-init.mkinitrd) ${DEST}/sbin/run-init || die
 
 # install insmod.static
-echo "$(which insmod.static)"
-install -m0755 $(which insmod.static) ${DEST}/sbin/insmod || die
+#echo "$(which insmod.static)"
+#install -m0755 $(which insmod.static) ${DEST}/sbin/insmod || die
 
 # install v86d for uvesafb support if installed
 if which v86d &> /dev/null
 then
-	echo "$(which insmod.static)"
+	echo "$(which v86d)"
 	install -m0755 $(which v86d) ${DEST}/sbin/v86d || die
 fi
 
 # create some needed device nodes
-install -o root -g root -m0754 ${MAKEDEV} ${DEST}/dev/MAKEDEV || die
-( cd ${DEST}/dev; ./MAKEDEV -v generic-nopty)
+#install -o root -g root -m0754 ${MAKEDEV} ${DEST}/dev/MAKEDEV || die
+#( cd ${DEST}/dev; ./MAKEDEV -v generic-nopty)
 
 ## install kernel modules ##
 # generic needed