--- trunk/mkinitrd/mkinitrd.sh	2006/01/01 16:05:20	308
+++ trunk/mkinitrd/mkinitrd.sh	2006/02/26 00:53:40	344
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mkinitrd/mkinitrd.sh,v 1.8 2006-01-01 16:05:20 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mkinitrd/mkinitrd.sh,v 1.9 2006-02-26 00:53:30 niro Exp $
 
 # mkinitrd
 #
@@ -649,38 +649,45 @@
 
 
 # create basic filesystem layout
-install -d ${DEST}/{bin,dev,etc,lib,loopfs,proc,sys,sysroot} || die
+install -d ${DEST}/{bin,dev,etc,lib,loopfs,proc,sbin,sys,sysroot} || die
 
 # install busybox
 echo "$(which busybox.mkinitrd)"
 install -m0755 $(which busybox.mkinitrd) ${DEST}/bin/busybox || die
-for i in '[' ash basename cat cut chroot clear cp dirname echo env false find \
-	grep gunzip gzip init ln ls loadkmap losetup mkdir mknod modprobe more mount mv \
-	pivot_root ps pwd rm rmdir sh sleep test touch true umount uname \
+for i in '[' ash basename cat cut clear cp dirname echo env false find \
+	grep gunzip gzip ln ls loadkmap mkdir mknod more mount mv \
+	ps pwd rm rmdir sh sleep test touch true umount uname \
 	xargs yes chmod chown
 do
 	# static links
 	ln ${DEST}/bin/busybox ${DEST}/bin/${i} || die "${i}"
 done
 
+# sbin related
+for i in chroot init losetup modprobe pivot_root
+do
+	# static links
+	ln ${DEST}/bin/busybox ${DEST}/sbin/${i} || die "${i}"
+done
+
 # install run-init
 echo "$(which run-init.mkinitrd)"
-install -m0755 $(which run-init.mkinitrd) ${DEST}/bin/run-init || die
+install -m0755 $(which run-init.mkinitrd) ${DEST}/sbin/run-init || die
 
 # install insmod.static
 echo "$(which insmod.static)"
-install -m0755 $(which insmod.static) ${DEST}/bin/insmod || die
+install -m0755 $(which insmod.static) ${DEST}/sbin/insmod || die
 
 # install udev
 cp -a /etc/udev ${DEST}/etc || die
-install -m0755 /sbin/udev.static ${DEST}/bin/udev || die
-install -m0755 /sbin/udevd.static ${DEST}/bin/udevd || die
-install -m0755 /sbin/udevstart.static ${DEST}/bin/udevstart || die
+install -m0755 /sbin/udev.static ${DEST}/sbin/udev || die
+install -m0755 /sbin/udevd.static ${DEST}/sbin/udevd || die
+install -m0755 /sbin/udevstart.static ${DEST}/sbin/udevstart || die
 
 # install lvm
 if [ -n "${vg_list}" ]
 then
-	inst /sbin/lvm.static "${DEST}/bin/lvm"
+	inst /sbin/lvm.static "${DEST}/sbin/lvm"
 	if [ -f /etc/lvm/lvm.conf ]
 	then
 		cp ${verbose} --parents /etc/lvm/lvm.conf ${DEST}/
@@ -688,7 +695,12 @@
 fi
 
 # create some needed device nodes
+mkdir ${DEST}/dev/pts || die
+mkdir ${DEST}/dev/shm || die
 mkdir ${DEST}/dev/mapper || die
+mkdir ${DEST}/dev/misc || die
+mkdir ${DEST}/dev/fb || die
+mkdir ${DEST}/dev/vc || die
 mknod ${DEST}/dev/console c 5 1 || die
 mknod ${DEST}/dev/null c 1 3 || die
 mknod ${DEST}/dev/ram b 1 1 || die
@@ -722,6 +734,9 @@
 add_initrd 'mkdir /dev/pts'
 add_initrd 'mkdir /dev/shm'
 add_initrd 'mkdir /dev/mapper'
+add_initrd 'mkdir /dev/misc'
+add_initrd 'mkdir /dev/fb'
+add_initrd 'mkdir /dev/vc'
 add_initrd 'mknod /dev/console c 5 1'
 add_initrd 'mknod /dev/null c 1 3'
 add_initrd 'mknod /dev/ram b 1 1'
@@ -737,7 +752,6 @@
 done
 
 add_initrd 'echo "-- Starting udevd ..."'
-add_initrd 'ln -snf bin /sbin'
 add_initrd '/sbin/udevstart'
 add_initrd 'ln -snf /proc/self/fd /dev/fd'
 add_initrd 'ln -snf fd/0 /dev/stdin'