Subject: bug#59066: closed (Re: bug#59066: [PATCH 1/1] linux-initrd: raw-initrd: Add keyword argument #:pre-mount.)

From: [email-masked] (GNU bug Tracking System)
Date: Fri, 18 Nov 2022 13:26:03 +0000

Your bug report

#59066: [PATCH 1/1] linux-initrd: raw-initrd: Add keyword argument #:pre-mount.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
59066: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59066
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#59066: [PATCH 1/1] linux-initrd: raw-initrd: Add keyword argument #:pre-mount.
From: Ludovic Courtès <[email-masked]>
To: Hilton Chain <[email-masked]>
Cc: [email-masked]
Date: Fri, 18 Nov 2022 14:25:03 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi,

Hilton Chain <[email-masked]> skribis:

> * gnu/system/linux-initrd.scm (raw-initrd): Add keyword argument #:pre-mount.
> Document it.
> * doc/guix.texi (initial RAM disk): Likewise.
> ---
> v1 -> v2:
> 1. Use gexp instead of a list.
> 2. Documentation.

Applied, thanks!

> Haven't begun my SSH test yet :P

Heh, no rush.  :-)

Ludo’.

Subject: [PATCH 1/1] linux-initrd: raw-initrd: Add keyword argument #:pre-mount.
From: Hilton Chain <[email-masked]>
To: [email-masked]
Date: Sun, 06 Nov 2022 09:45:45 +0800
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/system/linux-initrd.scm (raw-initrd): Add keyword argument #:pre-mount.
---
 gnu/system/linux-initrd.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index 4c4c78e444..1e72aaee1c 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -172,6 +172,7 @@ (define* (raw-initrd file-systems
                       #:key
                       (linux linux-libre)
                       (linux-modules '())
+                      (pre-mount '())
                       (mapped-devices '())
                       (keyboard-layout #f)
                       (helper-packages '())
@@ -255,7 +256,8 @@ (define kodir
                         (map spec->file-system
                              '#$(map file-system->spec file-systems))
                         #:pre-mount (lambda ()
-                                      (and #$@device-mapping-commands
+                                      (and #$@pre-mount
+                                           #$@device-mapping-commands
                                            #$@file-system-scan-commands))
                         #:linux-modules '#$linux-modules
                         #:linux-module-directory '#$kodir
-- 
2.38.0