[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#29922] [PATCH v2] linux-boot: Improve error reporting.
From: |
Ludovic Courtès |
Subject: |
[bug#29922] [PATCH v2] linux-boot: Improve error reporting. |
Date: |
Mon, 08 Jan 2018 15:05:36 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) |
Danny Milosavljevic <address@hidden> skribis:
> I think it's better if, instead, we give the initrd (at least) a new
> parameter enter-repl-on-errors?, defaulting to #t,
‘call-with-error-handling’ already has #:on-debug, so I figured we could
simply expose that:
diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index 4dd740174..997107a67 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès
<address@hidden>
;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
@@ -430,7 +430,8 @@ bailing out.~%root contents: ~s~%" (scandir "/"))
qemu-guest-networking?
volatile-root?
pre-mount
- (mounts '()))
+ (mounts '())
+ (on-error 'debug))
"This procedure is meant to be called from an initrd. Boot a system by
first loading LINUX-MODULES (a list of module names) from
LINUX-MODULE-DIRECTORY, then setting up QEMU guest networking if
@@ -444,7 +445,10 @@ if any.
MOUNTS must be a list of <file-system> objects.
When VOLATILE-ROOT? is true, the root file system is writable but any changes
-to it are lost."
+to it are lost.
+
+ON-ERROR is passed to 'call-with-error-handling'; it determines what happens
+upon error."
(define (root-mount-point? fs)
(string=? (file-system-mount-point fs) "/"))
@@ -517,6 +521,7 @@ to it are lost."
(begin
(display "no boot file passed via '--load'\n")
(display "entering a warm and cozy REPL\n")
- (start-repl)))))))
+ (start-repl)))))
+ #:on-error on-error))
;;; linux-initrd.scm ends here
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index b592defa4..0f7f4721d 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès
<address@hidden>
;;; Copyright © 2016 Mark H Weaver <address@hidden>
;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
@@ -155,7 +155,8 @@ MODULES and taken from LINUX."
(mapped-devices '())
(helper-packages '())
qemu-networking?
- volatile-root?)
+ volatile-root?
+ (on-error 'debug))
"Return a monadic derivation that builds a raw initrd, with kernel
modules taken from LINUX. FILE-SYSTEMS is a list of file-systems to be
mounted by the initrd, possibly in addition to the root file system specified
@@ -167,8 +168,12 @@ e2fsck/static or other packages needed by the initrd to
check root partition.
When QEMU-NETWORKING? is true, set up networking with the standard QEMU
parameters.
+
When VOLATILE-ROOT? is true, the root file system is writable but any changes
-to it are lost."
+to it are lost.
+
+ON-ERROR is passed to 'call-with-error-handling'; it determines what happens
+upon error."
(define device-mapping-commands
;; List of gexps to open the mapped devices.
(map (lambda (md)
@@ -216,7 +221,8 @@ to it are lost."
#:linux-modules '#$linux-modules
#:linux-module-directory '#$kodir
#:qemu-guest-networking? #$qemu-networking?
- #:volatile-root? '#$volatile-root?)))
+ #:volatile-root? '#$volatile-root?
+ #:on-error '#$on-error)))
#:name "raw-initrd"))
(define* (file-system-packages file-systems #:key (volatile-root? #f))
@@ -243,7 +249,8 @@ FILE-SYSTEMS."
qemu-networking?
volatile-root?
(virtio? #t)
- (extra-modules '()))
+ (extra-modules '())
+ (on-error 'debug))
"Return a monadic derivation that builds a generic initrd, with kernel
modules taken from LINUX. FILE-SYSTEMS is a list of file-systems to be
mounted by the initrd, possibly in addition to the root file system specified
@@ -318,6 +325,7 @@ loaded at boot time in the order in which they appear."
#:mapped-devices mapped-devices
#:helper-packages helper-packages
#:qemu-networking? qemu-networking?
- #:volatile-root? volatile-root?))
+ #:volatile-root? volatile-root?
+ #:on-error on-error))
;;; linux-initrd.scm ends here
I’ll push it if it works for you.
Ludo’.
- [bug#29922] [PATCH v2] linux-boot: Improve error reporting., Danny Milosavljevic, 2018/01/01
- [bug#29922] [PATCH v2] linux-boot: Improve error reporting., Danny Milosavljevic, 2018/01/01
- [bug#29922] [PATCH v2] linux-boot: Improve error reporting., Ludovic Courtès, 2018/01/08
- [bug#29922] [PATCH v2] linux-boot: Improve error reporting., Danny Milosavljevic, 2018/01/08
- [bug#29922] [PATCH v2] linux-boot: Improve error reporting.,
Ludovic Courtès <=
- [bug#29922] [PATCH v2] linux-boot: Improve error reporting., Danny Milosavljevic, 2018/01/08
- [bug#29922] [PATCH v2] linux-boot: Improve error reporting., Ludovic Courtès, 2018/01/08
- [bug#29922] [PATCH 0/2] Make sure that marionette-operating-system fails on error., Danny Milosavljevic, 2018/01/09
- [bug#29922] [PATCH 1/2] system: Export operating-system-user-kernel-arguments., Danny Milosavljevic, 2018/01/09
- [bug#29922] [PATCH 2/2] tests: marionette-operating-system: Add initrd parameter and kernel-arguments., Danny Milosavljevic, 2018/01/09
- [bug#29922] [PATCH 0/2] Make sure that marionette-operating-system fails on error., Ludovic Courtès, 2018/01/09