X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=appliance%2Finit;h=bc94393457866709bb507f4381d5a1506d3cb408;hb=fe6072ecc6f7ea6f7ce50199c0788ac5aa6c76e3;hp=bd93d15964ded6b781183636f20d858b0e682881;hpb=93ae3fa9da7e31bba563977ee61b2df1b395400f;p=libguestfs.git

diff --git a/appliance/init b/appliance/init
index bd93d15..bc94393 100755
--- a/appliance/init
+++ b/appliance/init
@@ -5,6 +5,11 @@ 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
@@ -23,7 +28,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
@@ -68,7 +78,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