diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2023-08-08 11:47:08 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-08-08 18:01:54 +0200 |
| commit | 5652c2e14728cf746f86c4ec34a84e99eb34f9a0 (patch) | |
| tree | 8794847d7f12cb818157c3cbbc1e8eb01da9a537 | |
| parent | 782ef67a59f4b564f16101cf23c30a3777b3f734 (diff) | |
| download | guix-5652c2e14728cf746f86c4ec34a84e99eb34f9a0.tar.gz | |
system: Do not check initrd modules for pseudo file systems.
Reported by hako on #guix. * gnu/machine/ssh.scm (machine-check-initrd-modules): Filter out pseudo file systems from 'file-systems'. * guix/scripts/system.scm (check-initrd-modules): Likewise.
| -rw-r--r-- | gnu/machine/ssh.scm | 7 | ||||
| -rw-r--r-- | guix/scripts/system.scm | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 343cf74748..b5984dc732 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org> -;;; Copyright © 2020-2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2020-2023 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -291,7 +291,10 @@ exist on the machine." if any of the modules needed by 'needed-for-boot' file systems in MACHINE are not available in the initrd." (define file-systems - (filter file-system-needed-for-boot? + (filter (lambda (file-system) + (and (file-system-needed-for-boot? file-system) + (not (member (file-system-type file-system) + %pseudo-file-system-types)))) (operating-system-file-systems (machine-operating-system machine)))) (define (missing-modules fs) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index f1154dad33..acbe3dab2c 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -686,7 +686,10 @@ checking this by themselves in their 'check' procedure." (find-partition-by-label (file-system-label->string device)))))) (define file-systems - (filter file-system-needed-for-boot? + (filter (lambda (file-system) + (and (file-system-needed-for-boot? file-system) + (not (member (file-system-type file-system) + %pseudo-file-system-types)))) (operating-system-file-systems os))) (for-each (lambda (fs) |