guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/05: vm: Pass "panic=1" to Linux.


From: Ludovic Courtès
Subject: 01/05: vm: Pass "panic=1" to Linux.
Date: Fri, 25 May 2018 07:43:18 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 98e0b1288f387165f5a2240cb98f2ae1f8d2fc8a
Author: Ludovic Courtès <address@hidden>
Date:   Fri May 25 12:04:22 2018 +0200

    vm: Pass "panic=1" to Linux.
    
    * gnu/build/vm.scm (load-in-linux-vm): Always pass "panic=1" after 
'-append'.
---
 gnu/build/vm.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 989b74f..fa3ce77 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -106,11 +106,16 @@ the #:references-graphs parameter of 'derivation'."
                  (not target-arm32?))
             '("-enable-kvm")
             '())
+
+      ;; Pass "panic=1" so that the guest dies upon error.
       "-append"
-      ;; The serial port name differs between emulated architectures/machines.
-      ,@(if target-arm32?
-            `(,(string-append "console=ttyAMA0 --load=" builder))
-            `(,(string-append "console=ttyS0 --load=" builder)))
+      ,(string-append "panic=1 --load=" builder
+
+                      ;; The serial port name differs between emulated
+                      ;; architectures/machines.
+                      " console="
+                      (if target-arm32? "ttyAMA0" "ttyS0"))
+
       ;; NIC is not supported on ARM "virt" machine, so use a user mode
       ;; network stack instead.
       ,@(if target-arm32?



reply via email to

[Prev in Thread] Current Thread [Next in Thread]