summaryrefslogtreecommitdiffstats
path: root/appliance/init
diff options
context:
space:
mode:
Diffstat (limited to 'appliance/init')
-rwxr-xr-xappliance/init45
1 files changed, 24 insertions, 21 deletions
diff --git a/appliance/init b/appliance/init
index 6aeea0c3..90da1cb5 100755
--- a/appliance/init
+++ b/appliance/init
@@ -88,27 +88,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 "(Don't worry if you see a 'Kernel panic' message below)"
+ 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