X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=appliance%2Finit;h=ee803348896c0c917e44074125d23750806d7d5f;hb=2b1da45749beb953f4c9b17cdc0b1cedd5961d08;hp=1d31cd83451a88d092a6641db08abf1c3f1b146c;hpb=91324e0a732fe592f2eecd5b541c731bf4f34b74;p=libguestfs.git

diff --git a/appliance/init b/appliance/init
index 1d31cd8..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