diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-05-27 01:26:09 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-05-27 01:26:09 -0400 |
| commit | 1640f16e7888291227d11647dbb5f83ad5d138a1 (patch) | |
| tree | bf979aa4e6538b8261762cfbb80512ebb023b016 /gnu/build | |
| parent | 0ff4e49a95d8a54cd5508f441b927a670d348519 (diff) | |
| parent | a4e45acdc07fc3faf2844b3658ee31ebc538bd1c (diff) | |
| download | guix-1640f16e7888291227d11647dbb5f83ad5d138a1.tar guix-1640f16e7888291227d11647dbb5f83ad5d138a1.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/build')
| -rw-r--r-- | gnu/build/vm.scm | 13 |
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? |