X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=appliance%2Finit;h=50dd76da3acdeb560dbc74c0296b01968dece460;hb=cf4cc1143393d607a7fb4cdbee1434544237d5d4;hp=90da1cb5c425e31fdde362be152422287eaa8266;hpb=c0b38fbb27c8771916386f47361833722d54518f;p=libguestfs.git

diff --git a/appliance/init b/appliance/init
index 90da1cb..50dd76d 100755
--- a/appliance/init
+++ b/appliance/init
@@ -5,9 +5,16 @@ echo Starting /init script ...
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 export PATH
 
+# Debian bug 606622.
+RUNLEVEL=S
+PREVLEVEL=N
+export RUNLEVEL PREVLEVEL
+
 mkdir -p /sysroot
 
+rm -f /proc; mkdir /proc
 mount -t proc /proc /proc
+rm -f /sys; mkdir /sys
 mount -t sysfs /sys /sys
 
 if [ ! -L /etc/init.d/udev -a -x /etc/init.d/udev ]; then
@@ -22,7 +29,7 @@ elif [ -x /sbin/udevd ]; then
   echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
   /sbin/udevd --daemon
   /sbin/udevadm trigger
-  /sbin/udevadm settle --timeout=10
+  /sbin/udevadm settle
 else
   echo No udev, creating /dev manually
   mount -t tmpfs none /dev
@@ -67,11 +74,13 @@ lvm vgchange -ay --ignorelockingfailure
 for f in /sys/block/vd*/queue/rotational; do echo 1 > $f; done
 
 # http://kbase.redhat.com/faq/docs/DOC-5428
-for f in /sys/block/[hsv]d*/queue/scheduler; do echo noop > $f; done
+# Disabled this until https://bugzilla.redhat.com/show_bug.cgi?id=630583
+# is fixed (broken in Linux 2.6.36).
+#for f in /sys/block/[hsv]d*/queue/scheduler; do echo noop > $f; done
 
 # These are useful when debugging.
 if grep -sq guestfs_verbose=1 /proc/cmdline; then
-    ls -l /dev
+    ls -lR /dev
     cat /proc/mounts
     lvm pvs
     lvm vgs
@@ -89,7 +98,7 @@ fi
 
 if ! grep -sq guestfs_rescue=1 /proc/cmdline; then
   # The host will kill qemu abruptly if guestfsd shuts down normally
-  guestfsd -f
+  guestfsd
 
   # Otherwise we try to clean up gracefully. For example, this ensures that a
   # core dump generated by the guest daemon will be written to disk.
@@ -110,8 +119,8 @@ else
   bash -i
   echo
   echo "virt-rescue: Syncing the disk now before exiting ..."
-  echo "(Don't worry if you see a 'Kernel panic' message below)"
   echo
 fi
 
 sync
+/sbin/reboot -f