[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH WIP] linux-initrd: Add a raw-initrd and use it to define base-ini
From: |
Mathieu Othacehe |
Subject: |
[PATCH WIP] linux-initrd: Add a raw-initrd and use it to define base-initrd. |
Date: |
Tue, 7 Mar 2017 09:24:55 +0100 |
* gnu/system/linux-initrd.scm (raw-initrd): New exported variable.
(base-initrd): Use raw-initrd to build the initrd.
---
Hi Guix,
Here's a draft patch to provide a raw-initrd. The raw-initrd doesn't try
to guess kernel modules to be included in the initrd.
It has been discussed here :
https://lists.gnu.org/archive/html/guix-devel/2016-07/msg01524.html
and here :
https://lists.gnu.org/archive/html/guix-devel/2017-02/msg00937.html
As a summary, it is useful if you have a custom kernel config and base-initrd
tries
to include not compiled modules for example.
raw-initrd doesn't try neither to guess which helper-packages should be included
in the initrd. I'm not sure this is the right thing to do here.
Note I didn't update the doc yet as this is still a draft patch.
What do you think ?
Thank you,
Mathieu
gnu/system/linux-initrd.scm | 128 +++++++++++++++++++++++++++-----------------
1 file changed, 78 insertions(+), 50 deletions(-)
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index 4a753cdad..a7f916902 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -41,6 +41,7 @@
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:export (expression->initrd
+ raw-initrd
base-initrd))
@@ -131,13 +132,79 @@ MODULES and taken from LINUX."
(gexp->derivation "linux-modules" build-exp))
+(define* (raw-initrd file-systems
+ #:key
+ (linux linux-libre)
+ (linux-modules '())
+ (mapped-devices '())
+ (helper-packages '())
+ qemu-networking?
+ volatile-root?)
+ "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
+on the kernel command line via '--root'. LINUX-MODULES is a list of kernel
+modules to be loaded at boot time. MAPPED-DEVICES is a list of device
+mappings to realize before FILE-SYSTEMS are mounted.
+HELPER-PACKAGES is a list of packages to be copied in the initrd. It may
include
+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."
+ (define device-mapping-commands
+ ;; List of gexps to open the mapped devices.
+ (map (lambda (md)
+ (let* ((source (mapped-device-source md))
+ (target (mapped-device-target md))
+ (type (mapped-device-type md))
+ (open (mapped-device-kind-open type)))
+ (open source target)))
+ mapped-devices))
+
+ (mlet %store-monad ((kodir (flat-linux-module-directory linux
+ linux-modules)))
+ (expression->initrd
+ (with-imported-modules (source-module-closure
+ '((gnu build linux-boot)
+ (guix build utils)
+ (guix build bournish)
+ (gnu build file-systems)))
+ #~(begin
+ (use-modules (gnu build linux-boot)
+ (guix build utils)
+ (guix build bournish) ;add the 'bournish' meta-command
+ (srfi srfi-26)
+
+ ;; FIXME: The following modules are for
+ ;; LUKS-DEVICE-MAPPING. We should instead propagate
+ ;; this info via gexps.
+ ((gnu build file-systems)
+ #:select (find-partition-by-luks-uuid))
+ (rnrs bytevectors))
+
+ (with-output-to-port (%make-void-port "w")
+ (lambda ()
+ (set-path-environment-variable "PATH" '("bin" "sbin")
+ '#$helper-packages)))
+
+ (boot-system #:mounts '#$(map file-system->spec file-systems)
+ #:pre-mount (lambda ()
+ (and address@hidden))
+ #:linux-modules '#$linux-modules
+ #:linux-module-directory '#$kodir
+ #:qemu-guest-networking? #$qemu-networking?
+ #:volatile-root? '#$volatile-root?)))
+ #:name "raw-initrd")))
+
(define* (base-initrd file-systems
#:key
(linux linux-libre)
(mapped-devices '())
qemu-networking?
- (virtio? #t)
volatile-root?
+ (virtio? #t)
(extra-modules '()))
"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
@@ -145,14 +212,12 @@ mounted by the initrd, possibly in addition to the root
file system specified
on the kernel command line via '--root'. MAPPED-DEVICES is a list of device
mappings to realize before FILE-SYSTEMS are mounted.
-When QEMU-NETWORKING? is true, set up networking with the standard QEMU
-parameters. When VIRTIO? is true, load additional modules so the initrd can
+QEMU-NETWORKING? and VOLATILE-ROOT? behaves as in raw-initrd.
+
+When VIRTIO? is true, load additional modules so the initrd can
be used as a QEMU guest with the root file system on a para-virtualized block
device.
-When VOLATILE-ROOT? is true, the root file system is writable but any changes
-to it are lost.
-
The initrd is automatically populated with all the kernel modules necessary
for FILE-SYSTEMS and for the given options. However, additional kernel
modules can be listed in EXTRA-MODULES. They will be added to the initrd, and
@@ -224,49 +289,12 @@ loaded at boot time in the order in which they appear."
(list unionfs-fuse/static)
'())))
- (define device-mapping-commands
- ;; List of gexps to open the mapped devices.
- (map (lambda (md)
- (let* ((source (mapped-device-source md))
- (target (mapped-device-target md))
- (type (mapped-device-type md))
- (open (mapped-device-kind-open type)))
- (open source target)))
- mapped-devices))
-
- (mlet %store-monad ((kodir (flat-linux-module-directory linux
- linux-modules)))
- (expression->initrd
- (with-imported-modules (source-module-closure
- '((gnu build linux-boot)
- (guix build utils)
- (guix build bournish)
- (gnu build file-systems)))
- #~(begin
- (use-modules (gnu build linux-boot)
- (guix build utils)
- (guix build bournish) ;add the 'bournish' meta-command
- (srfi srfi-26)
-
- ;; FIXME: The following modules are for
- ;; LUKS-DEVICE-MAPPING. We should instead propagate
- ;; this info via gexps.
- ((gnu build file-systems)
- #:select (find-partition-by-luks-uuid))
- (rnrs bytevectors))
-
- (with-output-to-port (%make-void-port "w")
- (lambda ()
- (set-path-environment-variable "PATH" '("bin" "sbin")
- '#$helper-packages)))
-
- (boot-system #:mounts '#$(map file-system->spec file-systems)
- #:pre-mount (lambda ()
- (and address@hidden))
- #:linux-modules '#$linux-modules
- #:linux-module-directory '#$kodir
- #:qemu-guest-networking? #$qemu-networking?
- #:volatile-root? '#$volatile-root?)))
- #:name "base-initrd")))
+ (raw-initrd file-systems
+ #:linux linux
+ #:linux-modules linux-modules
+ #:mapped-devices mapped-devices
+ #:helper-packages helper-packages
+ #:qemu-networking? qemu-networking?
+ #:volatile-root? volatile-root?))
;;; linux-initrd.scm ends here
--
2.12.0
- [PATCH WIP] linux-initrd: Add a raw-initrd and use it to define base-initrd.,
Mathieu Othacehe <=