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

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