ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-26 12:39:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

file-systems: 'file-system-needed-for-boot?' always returns #t for "/".

Browse source 
Reported by Nikita Karetnikov.

* gnu/system/file-systems.scm (<file-system>): Rename 'needed-for-boot?'
  accessor to '%file-system-needed-for-boot?'.
  (file-system-needed-for-boot?): New inlinable procedure.
* gnu/system.scm (other-file-system-services)[file-systems]: Rely on
  'file-system-needed-for-boot?' to handle the "/" case.
  (operating-system-initrd-file)[boot-file-systems]: Likewise.
This commit is contained in:
Ludovic Courtès 2014-11-25 16:01:21 +01:00
parent 6eef465eea
commit 4d6b879cb5
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/system.scm
View file

@ -204,9 +204,7 @@ (define (other-file-system-services os)
"Return file system services for the file systems of OS that are not marked "Return file system services for the file systems of OS that are not marked
as 'needed-for-boot'." as 'needed-for-boot'."
(define file-systems (define file-systems
(remove (lambda (fs) (remove file-system-needed-for-boot?
(or (file-system-needed-for-boot? fs)
(string=? "/" (file-system-mount-point fs))))
(operating-system-file-systems os))) (operating-system-file-systems os)))
(define (device-mappings fs) (define (device-mappings fs)
@ -638,12 +636,7 @@ (define (operating-system-root-file-system os)
(define (operating-system-initrd-file os) (define (operating-system-initrd-file os)
"Return a gexp denoting the initrd file of OS." "Return a gexp denoting the initrd file of OS."
(define boot-file-systems (define boot-file-systems
(filter (match-lambda (filter file-system-needed-for-boot?
(($ <file-system> device title "/")
#t)
(($ <file-system> device title mount-point type flags
options boot?)
boot?))
(operating-system-file-systems os))) (operating-system-file-systems os)))
(define mapped-devices (define mapped-devices

8
gnu/system/file-systems.scm
View file

@ -70,13 +70,19 @@ (define-record-type* <file-system> file-system
(default '())) (default '()))
(options file-system-options ; string or #f (options file-system-options ; string or #f
(default #f)) (default #f))
(needed-for-boot? file-system-needed-for-boot? ; Boolean (needed-for-boot? %file-system-needed-for-boot? ; Boolean
(default #f)) (default #f))
(check? file-system-check? ; Boolean (check? file-system-check? ; Boolean
(default #t)) (default #t))
(create-mount-point? file-system-create-mount-point? ; Boolean (create-mount-point? file-system-create-mount-point? ; Boolean
(default #f))) (default #f)))
(define-inlinable (file-system-needed-for-boot? fs)
"Return true if FS has the 'needed-for-boot?' flag set, or if it's the root
file system."
(or (%file-system-needed-for-boot? fs)
(string=? "/" (file-system-mount-point fs))))
(define %fuse-control-file-system (define %fuse-control-file-system
;; Control file system for Linux' file systems in user-space (FUSE). ;; Control file system for Linux' file systems in user-space (FUSE).
(file-system (file-system