[SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (ebc61a3e99e2d11edaf5edf11135b9ba4856939c)

Justin Boffemmyer scm at sourcemage.org
Wed Oct 1 01:59:31 EDT 2008


GIT changes to test cauldron by Justin Boffemmyer <flux at sourcemage.org>:

 initrd/sbin/smgl.init |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit ebc61a3e99e2d11edaf5edf11135b9ba4856939c
Author: Justin Boffemmyer <flux at sourcemage.org>
Commit: Justin Boffemmyer <flux at sourcemage.org>

    smgl.init: added missing items
    
    Somehow a few things were missing from my version and what got
    committed. This adds in missing lines (udevadm trigger and settle),
    and fixes the shellout->shell naming.

diff --git a/initrd/sbin/smgl.init b/initrd/sbin/smgl.init
index 6b9c3bc..0690ce8 100755
--- a/initrd/sbin/smgl.init
+++ b/initrd/sbin/smgl.init
@@ -67,8 +67,9 @@ main()  {
 
   # Process init options directed at us
   while [[ $# -gt 0 ]] ;do
-    if [[ $1 == 'shellout' ]] ;then
+    if [[ $1 == 'shell' ]] ;then
       echo "requested a shellout!"
+      shell
     else
       INITOPTS[i++]=$1
     fi
@@ -110,6 +111,8 @@ main()  {
       continue
     fi
 
+    umount -n /dev
+    umount -n /sys
     umount -n /proc
 
     cd $MOUNT
@@ -129,7 +132,7 @@ main()  {
 
     mount -n -t proc proc proc
 
-    exec chroot . /sbin/init "${INITOPTS[@]}" <dev/console >dev/console 2>&1
+    exec /sbin/init "${INITOPTS[@]}" <dev/console >dev/console 2>&1
 
   done
 
@@ -144,6 +147,10 @@ mount -n -t sysfs sys	/sys
 mount -n -t tmpfs dev	/dev
 
 udevd --daemon
+udevadm trigger
+udevadm settle --timeout=60
+
+kill $(pidof udevd)
 
 KERNEL=`uname -r`
  MOUNT=/mnt/cdrom



More information about the SM-Commit mailing list