X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=appliance%2Finit;h=89b622cd8ad36870779f7ca7d7f8755525438a82;hb=7a916901fe144b137a3e9e1d78a2622d48e4290c;hp=98538de2e66349251a06ad373c5d83922c858e93;hpb=fbf29976b33a69c64dc7847c54454bf2cfa5fde6;p=libguestfs.git

diff --git a/appliance/init b/appliance/init
index 98538de..89b622c 100755
--- a/appliance/init
+++ b/appliance/init
@@ -5,10 +5,12 @@ echo Starting /init script ...
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 export PATH
 
+mkdir -p /sysroot
+
 mount -t proc /proc /proc
 mount -t sysfs /sys /sys
 
-if [ -x /etc/init.d/udev ]; then
+if [ ! -L /etc/init.d/udev -a -x /etc/init.d/udev ]; then
   if type service >/dev/null 2>&1; then
      service udev start
   else
@@ -64,21 +66,28 @@ 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
-lvm pvs
-lvm vgs
-lvm lvs
-ifconfig
-netstat -rn
-lsmod
-#hwclock -r
-date
-#ping -n -v -c 5 10.0.2.2
-#ping -n -v -c 5 10.0.2.4
-
-echo -n "uptime: "; cat /proc/uptime
+# http://kbase.redhat.com/faq/docs/DOC-5428
+# Disabled this until https://bugzilla.redhat.com/show_bug.cgi?id=630583
+# is fixed (broken in Linux 2.6.36).
+#for f in /sys/block/[hsv]d*/queue/scheduler; do echo noop > $f; done
+
+# These are useful when debugging.
+if grep -sq guestfs_verbose=1 /proc/cmdline; then
+    ls -l /dev
+    cat /proc/mounts
+    lvm pvs
+    lvm vgs
+    lvm lvs
+    ifconfig
+    netstat -rn
+    lsmod
+    #hwclock -r
+    date
+    #ping -n -v -c 5 10.0.2.2
+    #ping -n -v -c 5 10.0.2.4
+
+    echo -n "uptime: "; cat /proc/uptime
+fi
 
 if ! grep -sq guestfs_rescue=1 /proc/cmdline; then
   exec guestfsd -f