summaryrefslogtreecommitdiff
path: root/gnu/build
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-05-25 12:04:22 +0200
committerLudovic Courtès <ludo@gnu.org>2018-05-25 13:43:03 +0200
commit98e0b1288f387165f5a2240cb98f2ae1f8d2fc8a (patch)
treeb203b109b4fb4c457bbe3d90bf6ba7ee193adef1 /gnu/build
parent4806d390cb5ffd867dae663f71ea766d44378a2c (diff)
downloadpatches-98e0b1288f387165f5a2240cb98f2ae1f8d2fc8a.tar
patches-98e0b1288f387165f5a2240cb98f2ae1f8d2fc8a.tar.gz
vm: Pass "panic=1" to Linux.
* gnu/build/vm.scm (load-in-linux-vm): Always pass "panic=1" after '-append'.
Diffstat (limited to 'gnu/build')
-rw-r--r--gnu/build/vm.scm13
1 files changed, 9 insertions, 4 deletions
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 989b74f4f1..fa3ce7790d 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?