X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=appliance%2Finit;h=d7fe24e5f67b7b71284361a767b2a89ab5664fb5;hp=6aeea0c3ab691f7bd03c0dd856d75b50d44fee6b;hb=0c1d3c02a8147617ee0646e37d011235abdd2c22;hpb=5c1346dae72064f7fd9c2afe5517afc6f050cd9a

diff --git a/appliance/init b/appliance/init
index 6aeea0c..d7fe24e 100755
--- a/appliance/init
+++ b/appliance/init
@@ -7,6 +7,7 @@ export PATH
 
 mkdir -p /sysroot
 
+rm -f /proc; mkdir /proc
 mount -t proc /proc /proc
 mount -t sysfs /sys /sys
 
@@ -67,11 +68,13 @@ lvm vgchange -ay --ignorelockingfailure
 for f in /sys/block/vd*/queue/rotational; do echo 1 > $f; done
 
 # http://kbase.redhat.com/faq/docs/DOC-5428
-for f in /sys/block/[hsv]d*/queue/scheduler; do echo noop > $f; done
+# 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
+    ls -lR /dev
     cat /proc/mounts
     lvm pvs
     lvm vgs
@@ -88,27 +91,30 @@ if grep -sq guestfs_verbose=1 /proc/cmdline; then
 fi
 
 if ! grep -sq guestfs_rescue=1 /proc/cmdline; then
-  exec guestfsd -f
+  # The host will kill qemu abruptly if guestfsd shuts down normally
+  guestfsd -f
+
+  # 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.
+else
+  # Use appliance in rescue mode, also used by the virt-rescue command.
+  eval $(grep -Eo 'TERM=[^[:space:]]+' /proc/cmdline)
+  PS1='><rescue> '
+  export TERM PS1
+  echo
+  echo "------------------------------------------------------------"
+  echo
+  echo "Welcome to virt-rescue, the libguestfs rescue shell."
+  echo
+  echo "Note: The contents of / are the rescue appliance."
+  echo "You have to mount the guest's partitions under /sysroot"
+  echo "before you can examine them."
+  echo
+  bash -i
+  echo
+  echo "virt-rescue: Syncing the disk now before exiting ..."
+  echo
 fi
 
-# Use appliance in rescue mode, also used by the virt-rescue command.
-eval $(grep -Eo 'TERM=[^[:space:]]+' /proc/cmdline)
-PS1='><rescue> '
-export TERM PS1
-echo
-echo "------------------------------------------------------------"
-echo
-echo "Welcome to virt-rescue, the libguestfs rescue shell."
-echo
-echo "Note: The contents of / are the rescue appliance."
-echo "You have to mount the guest's partitions under /sysroot"
-echo "before you can examine them."
-echo
-bash -i
-echo
-echo "virt-rescue: Syncing the disk now before exiting ..."
-echo "(Don't worry if you see a 'Kernel panic' message below)"
-echo
-sync
-sleep 1
 sync
+/sbin/reboot -f