X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Fguestfs.c;h=9060c111c671a2db1513f8c9d46f223eacd62b3d;hb=f78de847966ce143c39f640a4ebecfa4b5236713;hp=c2af08c2b1588de0f074da54bb98653986ed33b1;hpb=dd8b152da0e899104fec305159640d08d7d6cdd9;p=libguestfs.git

diff --git a/src/guestfs.c b/src/guestfs.c
index c2af08c..9060c11 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");