git.annexia.org
/
libguestfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
12c714e
)
Force qemu quit when kernel panics (Charles Duffy).
author
Richard Jones
<rjones@redhat.com>
Fri, 8 May 2009 07:32:26 +0000
(08:32 +0100)
committer
Richard Jones
<rjones@redhat.com>
Fri, 8 May 2009 07:32:26 +0000
(08:32 +0100)
src/guestfs.c
patch
|
blob
|
history
diff --git
a/src/guestfs.c
b/src/guestfs.c
index
c2af08c
..
9060c11
100644
(file)
--- 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,
/* 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" : "");
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
#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");
add_cmdline (g, "-kernel");
add_cmdline (g, (char *) kernel);
add_cmdline (g, "-initrd");