me
/
guix
Archived
1
0
Fork 0
Code

gnu: Don't abuse check-btrfs-file-system to scan. 

It was never guaranteed to be run for non-root file systems.  It was for
root file systems only due to a bug now fixed.

* gnu/build/file-systems.scm (check-btrfs-file-system): Don't invoke
‘btrfs device scan’ here.
* gnu/system/linux-initrd.scm (raw-initrd): Do so here if any btrfs file
systems are present.
master
Tobias Geerinckx-Rice 2021-06-12 21:36:08 +02:00
parent a75a3d7132
commit 68b219b9f4
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/build/file-systems.scm
View File

@ -328,8 +328,6 @@ When FORCE? is true, do perform a real check. This is not recommended! See
@uref{https://bugzilla.redhat.com/show_bug.cgi?id=625967#c8}. If REPAIR is @uref{https://bugzilla.redhat.com/show_bug.cgi?id=625967#c8}. If REPAIR is
false, do not write to DEVICE. If it's #t, fix any errors found. Otherwise, false, do not write to DEVICE. If it's #t, fix any errors found. Otherwise,
fix only those considered safe to repair automatically." fix only those considered safe to repair automatically."
;; XXX Why make this conditional on (check? #t) at all?
(system* "btrfs" "device" "scan") ; ignore errors
(if force? (if force?
(match (status:exit-val (match (status:exit-val
(apply system* `("btrfs" "check" "--progress" (apply system* `("btrfs" "check" "--progress"

13
gnu/system/linux-initrd.scm
View File

@ -210,6 +210,16 @@ upon error."
(open source targets))) (open source targets)))
mapped-devices)) mapped-devices))
(define file-system-scan-commands
;; File systems like btrfs need help to assemble multi-device file systems
;; but do not use manually-specified <mapped-devices>.
(let ((file-system-types (map file-system-type file-systems)))
(if (member "btrfs" file-system-types)
;; Ignore errors: if the system manages to boot anyway, the better.
#~((system* (string-append #$btrfs-progs/static "/bin/btrfs")
"device" "scan"))
#~())))
(define kodir (define kodir
(flat-linux-module-directory linux linux-modules)) (flat-linux-module-directory linux linux-modules))
@ -245,7 +255,8 @@ upon error."
(map spec->file-system (map spec->file-system
'#$(map file-system->spec file-systems)) '#$(map file-system->spec file-systems))
#:pre-mount (lambda () #:pre-mount (lambda ()
(and #$@device-mapping-commands)) (and #$@device-mapping-commands
#$@file-system-scan-commands))
#:linux-modules '#$linux-modules #:linux-modules '#$linux-modules
#:linux-module-directory '#$kodir #:linux-module-directory '#$kodir
#:keymap-file #+(and=> keyboard-layout #:keymap-file #+(and=> keyboard-layout