diff options
| author | Richard Jones <rjones@redhat.com> | 2009-05-08 08:32:26 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2009-05-08 08:32:26 +0100 |
| commit | f78de847966ce143c39f640a4ebecfa4b5236713 (patch) | |
| tree | b0d58aeabec03a461f37796ea9f8e27e48b3bd26 | |
| parent | 12c714e71d0c084babd90b62679ad318a1569792 (diff) | |
| download | libguestfs-f78de847966ce143c39f640a4ebecfa4b5236713.tar.gz libguestfs-f78de847966ce143c39f640a4ebecfa4b5236713.tar.xz libguestfs-f78de847966ce143c39f640a4ebecfa4b5236713.zip | |
Force qemu quit when kernel panics (Charles Duffy).
| -rw-r--r-- | src/guestfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/guestfs.c b/src/guestfs.c index c2af08c2..9060c111 100644 --- a/src/guestfs.c +++ b/src/guestfs.c @@ -788,7 +788,7 @@ guestfs_launch (guestfs_h *g) /* Linux kernel command line. */ snprintf (append, sizeof append, - "console=ttyS0 guestfs=%s:%d%s", + "panic=1 console=ttyS0 guestfs=%s:%d%s", VMCHANNEL_ADDR, VMCHANNEL_PORT, g->verbose ? " guestfs_verbose=1" : ""); @@ -799,6 +799,7 @@ guestfs_launch (guestfs_h *g) #if 0 add_cmdline (g, "-no-kqemu"); /* Avoids a warning. */ #endif + add_cmdline (g, "-no-reboot"); /* Force exit instead of reboot on panic */ add_cmdline (g, "-kernel"); add_cmdline (g, (char *) kernel); add_cmdline (g, "-initrd"); |