appliance: udev-174 moves udevd to /lib/udev/udevd (instead of /sbin/udevd)

[libguestfs.git] / appliance / init

diff --git a/appliance/init b/appliance/init
index d7fe24e..ee80334 100755 (executable)
--- a/appliance/init
+++ b/appliance/init
@@ -5,11 +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
@@ -23,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
@@ -92,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.