[Devil-linux-commit] build/config/etc/initrd linuxrc,1.91,1.92

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv14817/config/etc/initrd

Modified Files:
	linuxrc 
Log Message:
added missing groups
added mdev and udev for device creation
fixed boot process
we can boot now !!!


Index: linuxrc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- linuxrc	1 Apr 2007 20:23:12 -0000	1.91
+++ linuxrc	3 Apr 2007 12:01:32 -0000	1.92
@@ -192,30 +192,13 @@
 
 # get rid of modprobe and udevd warnings 
 mkdir -p /shm/etc
-#cp /group /etc/group
 
-echo -e "Unpacking udev configuration"
-tar -xzf /udev-cfg.tar.gz -C /shm 
+echo "waiting until usb-storage driver has initialized all devices ..."
+sleep 10
 
-echo -e "Creating devices in /dev"
-set -x
+echo "Creating devices in /dev"
 /sbin/mdev -s
 echo "/sbin/mdev" > /proc/sys/kernel/hotplug
-# disable kernel hotplug, udev will handle this
-#echo > /proc/sys/kernel/hotplug
-#/sbin/udevd --daemon
-# make sure all events (even old ones) are handled
-#/sbin/udevtrigger
-# now let's wait until udev is done
-#/sbin/udevsettle
-#evaluate_retval
-#print_status success
-
-# and I'm sure we need to debug this first....
-/bin/sh
-
-echo "waiting until usb-storage driver has initialized all devices ..."
-sleep 10
 
 $GREEN
 echo "Searching for configuration media"
@@ -323,7 +306,7 @@
     $RED
     echo "Rebooting..."
     $NORMAL
-    exec /bin/chroot . /sbin/reboot -f
+    exec /usr/sbin/chroot . /sbin/reboot -f
 fi
 
 $GREEN
@@ -399,7 +382,8 @@
 modprobe -r 2> /dev/null
 
 # kill our klogd
-kill `ps | grep klogd | grep -v grep | awk '{ print $1 }'`
+#kill `ps | grep klogd | grep -v grep | awk '{ print $1 }'`
+killall klogd
 
 # create the devices we need
 mkdir -p /shm/dev/
@@ -420,7 +404,7 @@
 
 #change to new root and start up the real system
 pivot_root . initrd
-exec /bin/chroot . /sbin/pre_init $DL_CONFIG_SOURCE $DL_CONFIG_FILE $@ <dev/console >dev/console 2>&1
+exec /usr/sbin/chroot . /sbin/pre_init $DL_CONFIG_SOURCE $DL_CONFIG_FILE $@ <dev/console >dev/console 2>&1
 
 # something went wrong
 echo