X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=appliance%2Finit;h=84ee96e3033375936cf09ffbaa94ff963b085b4c;hb=35e916dbcf06ace10c73e67a0a20bae87bb0733b;hp=545232ce27fdab87c074e0b082395ebf544f8f53;hpb=1b21ed4f5d9307e87fad094ec177c90d5adb91ce;p=libguestfs.git

diff --git a/appliance/init b/appliance/init
index 545232c..84ee96e 100755
--- a/appliance/init
+++ b/appliance/init
@@ -8,9 +8,18 @@ mount -t proc /proc /proc
 mount -t sysfs /sys /sys
 
 if [ -x /etc/init.d/udev ]; then
-  /etc/init.d/udev start
-elif [ -x /sbin/start_udev ]; then
-  /sbin/start_udev
+  if type service >/dev/null 2>&1; then
+     service udev start
+  else
+     /etc/init.d/udev start
+  fi
+elif [ -x /sbin/start_udev ] && /sbin/start_udev; then
+  :
+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
 else
   echo No udev, creating /dev manually
   mount -t tmpfs none /dev
@@ -46,6 +55,9 @@ route add default gw 10.0.2.2
 lvm vgscan --ignorelockingfailure
 lvm vgchange -ay --ignorelockingfailure
 
+# Improve virtio-blk performance (RHBZ#509383).
+for f in /sys/block/vd*/queue/rotational; do echo 1 > $f; done
+
 # Keep these to enhance the usefulness of debug output.
 ls -l /dev
 cat /proc/mounts
@@ -58,8 +70,7 @@ lsmod
 #ping -n -v -c 5 10.0.2.2
 #ping -n -v -c 5 10.0.2.4
 
-# Improve virtio-blk performance (RHBZ#509383).
-for f in /sys/block/vd*/queue/rotational; do echo 1 > $f; done
+echo -n "uptime: "; cat /proc/uptime
 
 if ! grep -sq guestfs_rescue=1 /proc/cmdline; then
   exec guestfsd -f