X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=appliance%2Finit;h=ee803348896c0c917e44074125d23750806d7d5f;hp=cda64531512bdf05c8dd6c87240781298888893f;hb=fef0ff3d869d2ebdb48eea0c538270fc98f5952d;hpb=b76284876b9ab50b8aa5851fb960dbb66a58c2e2;ds=sidebyside

diff --git a/appliance/init b/appliance/init
index cda6453..ee80334 100755
--- a/appliance/init
+++ b/appliance/init
@@ -5,10 +5,18 @@ 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
+mkdir -p /run/lock
 
 if [ ! -L /etc/init.d/udev -a -x /etc/init.d/udev ]; then
   if type service >/dev/null 2>&1; then
@@ -22,7 +30,12 @@ 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
+elif [ -x /lib/udev/udevd ]; then
+  echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
+  /lib/udev/udevd --daemon
+  /sbin/udevadm trigger
+  /sbin/udevadm settle
 else
   echo No udev, creating /dev manually
   mount -t tmpfs none /dev
@@ -67,7 +80,9 @@ 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
@@ -89,7 +104,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.