From: Danny Milosavljevic <dannym@scratchpost.org>
To: 30604@debbugs.gnu.org
Subject: [bug#30604] [PATCH v7 6/6] linux-initrd: Provide modprobe to the initrd.
Date: Fri, 2 Mar 2018 16:34:08 +0100 [thread overview]
Message-ID: <20180302153408.14091-7-dannym@scratchpost.org> (raw)
In-Reply-To: <20180302153408.14091-1-dannym@scratchpost.org>
* gnu/build/linux-initrd.scm (build-initrd): Provide modprobe and the
linux modules to the initrd.
* gnu/system/linux-initrd.scm (%modprobe): New procedure.
(expression->initrd): Use it. Add linux-module-directory.
(raw-initrd): Pass linux-module-directory.
---
gnu/build/linux-initrd.scm | 13 +++++-
gnu/system/linux-initrd.scm | 99 +++++++++++++++++++++++++++++++++++++++------
2 files changed, 99 insertions(+), 13 deletions(-)
diff --git a/gnu/build/linux-initrd.scm b/gnu/build/linux-initrd.scm
index c65b5aacf..d4cb5e2d8 100644
--- a/gnu/build/linux-initrd.scm
+++ b/gnu/build/linux-initrd.scm
@@ -107,7 +107,7 @@ This is similar to what 'compiled-file-name' in (system base compile) does."
(define* (build-initrd output
#:key
- guile init
+ guile init modprobe linux-module-directory
(references-graphs '())
(gzip "gzip"))
"Write an initial RAM disk (initrd) to OUTPUT. The initrd starts the script
@@ -131,6 +131,17 @@ REFERENCES-GRAPHS."
(symlink (string-append guile "/bin/guile") "proc/self/exe")
(readlink "proc/self/exe")
+ ;; Make modprobe available as /sbin/modprobe so the kernel finds it.
+ (when modprobe
+ (mkdir-p "sbin")
+ (symlink modprobe "sbin/modprobe")
+ (compile-to-cache "sbin/modprobe"))
+
+ ;; Make modules available as /lib/modules so modprobe finds them.
+ (mkdir-p "lib")
+ (symlink (string-append linux-module-directory "/lib/modules")
+ "lib/modules")
+
;; Reset the timestamps of all the files that will make it in the initrd.
(for-each (lambda (file)
(unless (eq? 'symlink (stat:type (lstat file)))
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index b50d3ff80..8050ac47e 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -56,11 +56,73 @@
;;;
;;; Code:
+(define* (%modprobe linux-module-directory #:key
+ (guile %guile-static-stripped))
+ (program-file "modprobe"
+ (with-imported-modules (source-module-closure
+ '((gnu build linux-modules)))
+ #~(begin
+ (use-modules (gnu build linux-modules) (ice-9 getopt-long)
+ (ice-9 match) (srfi srfi-1) (ice-9 ftw))
+ (define (find-only-entry directory)
+ (match (scandir directory)
+ (("." ".." basename)
+ (string-append directory "/" basename))))
+ (define (resolve-alias alias)
+ (let* ((linux-release-module-directory
+ (find-only-entry (string-append "/lib/modules"))))
+ (match (delete-duplicates (matching-modules alias
+ (known-module-aliases
+ (string-append linux-release-module-directory
+ "/modules.alias"))))
+ (()
+ (error "no alias by that name" alias))
+ (items
+ items))))
+ (define (lookup-module module)
+ (let* ((linux-release-module-directory
+ (find-only-entry (string-append "/lib/modules")))
+ (file-name (string-append linux-release-module-directory
+ "/" (ensure-dot-ko module))))
+ (if (file-exists? file-name)
+ file-name
+ (error "no module file found for module" module))))
+ (define option-spec
+ '((quiet (single-char #\q) (value #f))))
+ (define options
+ (getopt-long (command-line) option-spec))
+ (when (option-ref options 'quiet #f)
+ (current-error-port (%make-void-port "w"))
+ (current-output-port (%make-void-port "w")))
+ (let ((exit-status 0))
+ (for-each (match-lambda
+ (('quiet . #t)
+ #f)
+ ((() modules ...)
+ (for-each (lambda (alias)
+ (catch #t
+ (lambda ()
+ (let ((modules (resolve-alias alias))) (for-each (lambda (module)
+ (load-linux-module*
+ (lookup-module module)
+ #:lookup-module
+ lookup-module))
+ modules)))
+ (lambda (key . args)
+ (display (cons* key args)
+ (current-error-port))
+ (newline (current-error-port))
+ (set! exit-status 1))))
+ modules)))
+ options)
+ (exit exit-status))))
+ #:guile guile))
(define* (expression->initrd exp
#:key
(guile %guile-static-stripped)
(gzip gzip)
+ linux-module-directory
(name "guile-initrd")
(system (%current-system)))
"Return a derivation that builds a Linux initrd (a gzipped cpio archive)
@@ -73,6 +135,9 @@ the derivations referenced by EXP are automatically copied to the initrd."
(define init
(program-file "init" exp #:guile guile))
+ (define modprobe
+ (%modprobe linux-module-directory #:guile guile))
+
(define builder
(with-imported-modules (source-module-closure
'((gnu build linux-initrd)))
@@ -96,12 +161,17 @@ the derivations referenced by EXP are automatically copied to the initrd."
(build-initrd (string-append #$output "/initrd")
#:guile #$guile
#:init #$init
- ;; Copy everything INIT refers to into the initrd.
- #:references-graphs '("closure")
+ #:modprobe #$modprobe
+ #:linux-module-directory #$linux-module-directory
+ ;; Copy everything INIT and MODPROBE refer to into the
+ ;; initrd.
+ #:references-graphs '("init-closure"
+ "modprobe-closure")
#:gzip (string-append #$gzip "/bin/gzip")))))
(gexp->derivation name builder
- #:references-graphs `(("closure" ,init))))
+ #:references-graphs `(("init-closure" ,init)
+ ("modprobe-closure" ,modprobe))))
(define (flat-linux-module-directory linux modules)
"Return a flat directory containing the Linux kernel modules listed in
@@ -111,7 +181,7 @@ MODULES and taken from LINUX."
'((guix build utils)
(gnu build linux-modules)))
#~(begin
- (use-modules (ice-9 match) (ice-9 regex)
+ (use-modules (ice-9 match) (ice-9 regex) (ice-9 ftw)
(srfi srfi-1)
(guix build utils)
(gnu build linux-modules))
@@ -140,14 +210,18 @@ MODULES and taken from LINUX."
(recursive-module-dependencies modules
#:lookup-module lookup))))
- (mkdir #$output)
- (for-each (lambda (module)
- (format #t "copying '~a'...~%" module)
- (copy-file module
- (string-append #$output "/"
- (basename module))))
- (delete-duplicates modules)))))
-
+ (define version
+ (match
+ (filter
+ (lambda (name)
+ (not (string-prefix? "." name)))
+ (scandir module-dir))
+ ((item) item)))
+
+ (let ((output (string-append #$output "/lib/modules/" version)))
+ (mkdir-p output)
+ (install-module-files (delete-duplicates modules) output))
+ #t)))
(computed-file "linux-modules" build-exp))
(define* (raw-initrd file-systems
@@ -227,6 +301,7 @@ upon error."
#:qemu-guest-networking? #$qemu-networking?
#:volatile-root? '#$volatile-root?
#:on-error '#$on-error)))
+ #:linux-module-directory kodir
#:name "raw-initrd"))
(define* (file-system-packages file-systems #:key (volatile-root? #f))
next prev parent reply other threads:[~2018-03-02 15:35 UTC|newest]
Thread overview: 132+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-25 11:45 [bug#30604] [PATCH 0/4] Load Linux module only when supported hardware is present Danny Milosavljevic
2018-02-25 11:48 ` [bug#30604] [PATCH 1/4] gnu: kmod: Split off kmod-minimal Danny Milosavljevic
2018-02-25 11:48 ` [bug#30604] [PATCH 2/4] gnu: Add kmod-minimal-static Danny Milosavljevic
2018-02-25 11:48 ` [bug#30604] [PATCH 3/4] linux-initrd: Add kmod Danny Milosavljevic
2018-02-25 14:05 ` Mathieu Othacehe
2018-02-25 15:07 ` Danny Milosavljevic
2018-02-26 11:51 ` Mathieu Othacehe
2018-02-25 11:48 ` [bug#30604] [PATCH 4/4] linux-boot: Load kernel modules only when the hardware is present Danny Milosavljevic
2018-02-26 1:10 ` [bug#30604] [PATCH 1/4] gnu: kmod: Split off kmod-minimal Marius Bakke
2018-02-26 3:50 ` [bug#30604] [PATCH v2 0/6] Load Linux module only when supported hardware is present Danny Milosavljevic
2018-02-26 3:50 ` [bug#30604] [PATCH v2 1/6] gnu: kmod: Split off kmod-minimal Danny Milosavljevic
2018-02-26 3:50 ` [bug#30604] [PATCH v2 2/6] gnu: Add kmod-minimal-static Danny Milosavljevic
2018-02-26 3:50 ` [bug#30604] [PATCH v2 3/6] linux-initrd: Add kmod Danny Milosavljevic
2018-02-26 3:50 ` [bug#30604] [PATCH v2 4/6] linux-boot: Load kernel modules only when the hardware is present Danny Milosavljevic
2018-02-26 3:50 ` [bug#30604] [PATCH v2 5/6] vm: Allow qemu-image builder to load Linux kernel modules Danny Milosavljevic
2018-02-26 3:50 ` [bug#30604] [PATCH v2 6/6] vm: Make the virtio-blk is uniquely identifyable in /sys Danny Milosavljevic
2018-02-26 4:06 ` [bug#30604] [PATCH v3 0/6] Load Linux module only when supported hardware is present Danny Milosavljevic
2018-02-26 4:06 ` [bug#30604] [PATCH v3 1/6] gnu: kmod: Split off kmod-minimal Danny Milosavljevic
2018-02-26 4:06 ` [bug#30604] [PATCH v3 2/6] gnu: Add kmod-minimal-static Danny Milosavljevic
2018-02-26 4:06 ` [bug#30604] [PATCH v3 3/6] linux-initrd: Add kmod Danny Milosavljevic
2018-02-26 4:06 ` [bug#30604] [PATCH v3 4/6] linux-boot: Load kernel modules only when the hardware is present Danny Milosavljevic
2018-02-27 14:26 ` Ludovic Courtès
2018-02-26 4:06 ` [bug#30604] [PATCH v3 5/6] vm: Allow qemu-image builder to load Linux kernel modules Danny Milosavljevic
2018-02-26 4:06 ` [bug#30604] [PATCH v3 6/6] vm: Make the virtio-blk is uniquely identifyable in /sys Danny Milosavljevic
2018-02-27 11:26 ` [bug#30604] [PATCH v4 0/7] Load Linux module only when supported hardware is present Danny Milosavljevic
2018-02-27 11:26 ` [bug#30604] [PATCH v4 1/7] gnu: kmod: Split off kmod-minimal Danny Milosavljevic
2018-02-27 11:26 ` [bug#30604] [PATCH v4 2/7] gnu: Add kmod-minimal-static Danny Milosavljevic
2018-02-27 11:26 ` [bug#30604] [PATCH v4 3/7] linux-initrd: Add kmod Danny Milosavljevic
2018-02-27 11:26 ` [bug#30604] [PATCH v4 4/7] linux-boot: Load kernel modules only when the hardware is present Danny Milosavljevic
2018-02-27 11:26 ` [bug#30604] [PATCH v4 5/7] vm: Allow qemu-image builder to load Linux kernel modules Danny Milosavljevic
2018-02-27 11:26 ` [bug#30604] [PATCH v4 6/7] vm: Make the virtio-blk uniquely identifyable in /sys Danny Milosavljevic
2018-02-27 11:26 ` [bug#30604] [PATCH v4 7/7] linux-boot: Call make-static-device-nodes much earlier Danny Milosavljevic
2018-02-27 15:50 ` [bug#30604] [PATCH v5 0/7] Load Linux module only when supported hardware is present Danny Milosavljevic
2018-02-27 15:50 ` [bug#30604] [PATCH v5 1/7] gnu: kmod: Split off kmod-minimal Danny Milosavljevic
2018-02-27 15:50 ` [bug#30604] [PATCH v5 2/7] gnu: Add kmod-minimal-static Danny Milosavljevic
2018-02-27 15:50 ` [bug#30604] [PATCH v5 3/7] linux-initrd: Add kmod Danny Milosavljevic
2018-02-27 15:50 ` [bug#30604] [PATCH v5 4/7] linux-boot: Load kernel modules only when the hardware is present Danny Milosavljevic
2018-02-27 15:50 ` [bug#30604] [PATCH v5 5/7] vm: Allow qemu-image builder to load Linux kernel modules Danny Milosavljevic
2018-02-27 15:50 ` [bug#30604] [PATCH v5 6/7] vm: Make the virtio-blk is uniquely identifyable in /sys Danny Milosavljevic
2018-02-27 15:50 ` [bug#30604] [PATCH v5 7/7] linux-boot: Call make-static-device-nodes much earlier Danny Milosavljevic
2018-03-02 14:16 ` [bug#30604] [PATCH v6 0/6] Load Linux module only when supported hardware is present Danny Milosavljevic
2018-03-02 14:17 ` [bug#30604] [PATCH v6 1/6] linux-modules: Add module-aliases Danny Milosavljevic
2018-03-02 14:17 ` [bug#30604] [PATCH v6 2/6] linux-modules: Add install-modules Danny Milosavljevic
2018-03-02 14:17 ` [bug#30604] [PATCH v6 3/6] linux-boot: Load kernel modules only when the hardware is present Danny Milosavljevic
2018-03-02 14:17 ` [bug#30604] [PATCH v6 4/6] vm: Allow qemu-image builder to load Linux kernel modules Danny Milosavljevic
2018-03-02 14:17 ` [bug#30604] [PATCH v6 5/6] vm: Make the virtio-blk uniquely identifiable in /sys Danny Milosavljevic
2018-03-02 14:17 ` [bug#30604] [PATCH v6 6/6] linux-initrd: Provide modprobe to the initrd Danny Milosavljevic
2018-03-02 15:34 ` [bug#30604] [PATCH v7 0/6] Load Linux module only when supported hardware is present Danny Milosavljevic
2018-03-02 15:34 ` [bug#30604] [PATCH v7 1/6] linux-modules: Add module-aliases Danny Milosavljevic
2018-03-02 16:47 ` Danny Milosavljevic
2018-03-02 15:34 ` [bug#30604] [PATCH v7 2/6] linux-modules: Add install-modules Danny Milosavljevic
2018-03-02 15:34 ` [bug#30604] [PATCH v7 3/6] linux-boot: Load kernel modules only when the hardware is present Danny Milosavljevic
2018-03-02 16:47 ` Danny Milosavljevic
2018-03-02 15:34 ` [bug#30604] [PATCH v7 4/6] vm: Allow qemu-image builder to load Linux kernel modules Danny Milosavljevic
2018-03-02 15:34 ` [bug#30604] [PATCH v7 5/6] vm: Make the virtio-blk uniquely identifiable in /sys Danny Milosavljevic
2018-03-02 15:34 ` Danny Milosavljevic [this message]
2018-03-03 13:55 ` [bug#30604] [PATCH v8 0/7] Load Linux module only when supported hardware is present Danny Milosavljevic
2018-03-03 13:55 ` [bug#30604] [PATCH v8 1/7] linux-modules: Add module-aliases Danny Milosavljevic
2018-03-03 21:58 ` Ludovic Courtès
2018-03-03 13:55 ` [bug#30604] [PATCH v8 2/7] linux-modules: Add install-modules Danny Milosavljevic
2018-03-03 15:32 ` Danny Milosavljevic
2018-03-03 22:07 ` Ludovic Courtès
2018-03-04 12:45 ` Danny Milosavljevic
2018-03-04 12:53 ` Danny Milosavljevic
2018-03-03 13:55 ` [bug#30604] [PATCH v8 3/7] linux-boot: Load kernel modules only when the hardware is present Danny Milosavljevic
2018-03-03 22:48 ` Ludovic Courtès
2018-03-04 1:06 ` Danny Milosavljevic
2018-03-04 1:54 ` Danny Milosavljevic
2018-03-04 12:34 ` Danny Milosavljevic
2018-03-09 22:06 ` Ludovic Courtès
2018-03-09 22:13 ` Danny Milosavljevic
2018-03-09 22:19 ` Danny Milosavljevic
2018-03-09 22:44 ` Danny Milosavljevic
2018-03-12 12:38 ` Ludovic Courtès
2018-03-12 12:39 ` [bug#30604] [PATCH v10 1/6] linux-modules: Add "modules.alias" writer Ludovic Courtès
2018-03-12 12:39 ` [bug#30604] [PATCH v10 2/6] linux-modules: Add 'load-linux-modules-from-directory' Ludovic Courtès
2018-03-12 19:26 ` Danny Milosavljevic
2018-03-12 12:39 ` [bug#30604] [PATCH v10 3/6] linux-modules: Add 'load-needed-linux-modules' Ludovic Courtès
2018-03-12 19:40 ` Danny Milosavljevic
2018-03-12 21:10 ` Ludovic Courtès
2018-03-12 12:39 ` [bug#30604] [PATCH v10 4/6] vm: Make the virtio-blk uniquely identifiable in /sys Ludovic Courtès
2018-03-12 12:39 ` [bug#30604] [PATCH v10 5/6] linux-initrd: Provide our own 'modprobe' program Ludovic Courtès
2018-03-12 20:09 ` Danny Milosavljevic
2018-03-12 21:12 ` Danny Milosavljevic
2018-03-13 8:54 ` Ludovic Courtès
2018-03-12 22:14 ` Ludovic Courtès
2018-03-12 22:15 ` [bug#30604] [PATCH v11 1/6] linux-modules: Add "modules.alias" writer Ludovic Courtès
2018-03-12 22:15 ` [bug#30604] [PATCH v11 2/6] linux-modules: Add 'load-linux-modules-from-directory' Ludovic Courtès
2018-03-12 22:48 ` Danny Milosavljevic
2018-03-12 22:15 ` [bug#30604] [PATCH v11 3/6] linux-modules: Add 'load-needed-linux-modules' Ludovic Courtès
2018-03-12 23:00 ` Danny Milosavljevic
2018-03-13 8:55 ` Ludovic Courtès
2018-03-12 22:15 ` [bug#30604] [PATCH v11 4/6] vm: Make the virtio-blk uniquely identifiable in /sys Ludovic Courtès
2018-03-12 22:49 ` Danny Milosavljevic
2018-03-12 22:15 ` [bug#30604] [PATCH v11 5/6] linux-initrd: Provide our own 'modprobe' program Ludovic Courtès
2018-03-13 8:50 ` Ludovic Courtès
2018-03-13 9:28 ` Ludovic Courtès
2018-03-13 12:28 ` Danny Milosavljevic
2018-03-12 22:15 ` [bug#30604] [PATCH v11 6/6] linux-modules: Add "modules.devname" writer Ludovic Courtès
2018-03-12 22:55 ` Danny Milosavljevic
2018-03-13 8:56 ` Ludovic Courtès
2018-03-12 22:48 ` [bug#30604] [PATCH v11 1/6] linux-modules: Add "modules.alias" writer Danny Milosavljevic
2018-03-13 9:27 ` [bug#30604] [PATCH v10 5/6] linux-initrd: Provide our own 'modprobe' program Danny Milosavljevic
2018-03-13 10:51 ` Ludovic Courtès
2018-03-13 12:05 ` Danny Milosavljevic
2018-03-13 19:17 ` Danny Milosavljevic
2018-03-12 12:39 ` [bug#30604] [PATCH v10 6/6] linux-modules: Add "modules.devname" writer Ludovic Courtès
2018-03-12 19:54 ` [bug#30604] [PATCH v10 1/6] linux-modules: Add "modules.alias" writer Danny Milosavljevic
2018-03-12 21:13 ` Ludovic Courtès
2018-03-09 22:36 ` [bug#30604] [PATCH v8 3/7] linux-boot: Load kernel modules only when the hardware is present Danny Milosavljevic
2018-03-03 13:55 ` [bug#30604] [PATCH v8 4/7] vm: Allow qemu-image builder to load Linux kernel modules Danny Milosavljevic
2018-03-03 13:55 ` [bug#30604] [PATCH v8 5/7] vm: Make the virtio-blk uniquely identifiable in /sys Danny Milosavljevic
2018-03-03 13:55 ` [bug#30604] [PATCH v8 6/7] linux-initrd: Provide modprobe to the initrd Danny Milosavljevic
2018-03-03 13:55 ` [bug#30604] [PATCH v8 7/7] linux-initrd: Factorize %modprobe and flat-linux-module-directory Danny Milosavljevic
2018-03-03 18:01 ` Danny Milosavljevic
2018-03-04 1:09 ` [bug#30604] [PATCH v9 0/7] Load Linux module only when supported hardware is present Danny Milosavljevic
2018-03-04 1:09 ` [bug#30604] [PATCH v9 1/7] linux-modules: Add "modules.devname" and "modules.alias" writer Danny Milosavljevic
2018-03-04 1:09 ` [bug#30604] [PATCH v9 2/7] linux-modules: Add module-aliases->module-file-names Danny Milosavljevic
2018-03-04 1:09 ` [bug#30604] [PATCH v9 3/7] linux-initrd: Provide pure-Guile modprobe Danny Milosavljevic
2018-03-11 20:24 ` Danny Milosavljevic
2018-03-12 14:45 ` Ludovic Courtès
2018-03-12 17:51 ` Danny Milosavljevic
2018-03-04 1:09 ` [bug#30604] [PATCH v9 4/7] linux-boot: Load kernel modules only when the hardware is present Danny Milosavljevic
2018-03-04 1:09 ` [bug#30604] [PATCH v9 5/7] vm: Allow qemu-image builder to load Linux kernel modules Danny Milosavljevic
2018-03-04 1:09 ` [bug#30604] [PATCH v9 6/7] vm: Make the virtio-blk uniquely identifiable in /sys Danny Milosavljevic
2018-03-04 1:09 ` [bug#30604] [PATCH v9 7/7] linux-initrd: Use module-aliases->module-file-names, too Danny Milosavljevic
2018-03-09 22:26 ` Danny Milosavljevic
2018-03-18 15:03 ` [bug#30604] Keyboard detection before ‘cryptsetup’ runs Ludovic Courtès
2018-03-23 13:02 ` Danny Milosavljevic
2018-03-23 15:07 ` Danny Milosavljevic
2018-03-24 17:07 ` Ludovic Courtès
2018-03-24 17:12 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180302153408.14091-7-dannym@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=30604@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.