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

diff --git a/appliance/init b/appliance/init
index 4a9476d..ee80334 100755
--- a/appliance/init
+++ b/appliance/init
@@ -14,7 +14,9 @@ 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
@@ -28,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
@@ -97,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.