summaryrefslogtreecommitdiff
path: root/gnu/build/vm.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/build/vm.scm')
-rw-r--r--gnu/build/vm.scm16
1 files changed, 11 insertions, 5 deletions
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 527b4c495d..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?
@@ -265,7 +270,8 @@ actual /dev name based on DEVICE."
#:key label uuid)
"Create an ext-family file system of TYPE on PARTITION. If LABEL is true,
use that as the volume name. If UUID is true, use it as the partition UUID."
- (format #t "creating ~a partition...\n" type)
+ (format #t "creating ~a partition... ~@[label: ~s~] ~@[uuid: ~s~]\n"
+ type label (and uuid (uuid->string uuid)))
(apply invoke (string-append "mkfs." type)
"-F" partition
`(,@(if label