ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux-boot: Handle nfs-root device strings.

Browse source 
* gnu/build/linux-boot.scm (device-string->file-system-device): Support
nfs-root "device" strings.
* gnu/build/file-systems.scm (canonicalize-device-spec): Support nfs-root
"device" strings.
* gnu/machine/ssh.scm (machine-check-file-system-availability): Avoid
checking of NFS file systems.
* gnu/system.scm (read-boot-parameters, device-sexp->device): Support
nfs-root "device" strings.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
This commit is contained in:
Stefan 2020-09-07 10:04:19 +02:00 committed by Danny Milosavljevic
parent 0e5a68a271
commit 1c3b709edb
No known key found for this signature in database
GPG key ID: E71A35542C30BAA5
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gnu/build/file-systems.scm
View file

@ -675,7 +675,8 @@ (define find-partition-by-luks-uuid
(define (canonicalize-device-spec spec) (define (canonicalize-device-spec spec)
"Return the device name corresponding to SPEC, which can be a <uuid>, a "Return the device name corresponding to SPEC, which can be a <uuid>, a
<file-system-label>, or a string (typically a /dev file name)." <file-system-label>, or a string (typically a /dev file name or an nfs-root
containing ':/')."
(define max-trials (define max-trials
;; Number of times we retry partition label resolution, 1 second per ;; Number of times we retry partition label resolution, 1 second per
;; trial. Note: somebody reported a delay of 16 seconds (!) before their ;; trial. Note: somebody reported a delay of 16 seconds (!) before their

5
gnu/build/linux-boot.scm
View file

@ -469,9 +469,10 @@ (define (root-mount-point? fs)
(define (device-string->file-system-device device-string) (define (device-string->file-system-device device-string)
;; The "--root=SPEC" kernel command-line option always provides a ;; The "--root=SPEC" kernel command-line option always provides a
;; string, but the string can represent a device, a UUID, or a ;; string, but the string can represent a device, an nfs-root, a UUID, or a
;; label. So check for all three. ;; label. So check for all four.
(cond ((string-prefix? "/" device-string) device-string) (cond ((string-prefix? "/" device-string) device-string)
((string-contains device-string ":/") device-string) ; nfs-root
((uuid device-string) => identity) ((uuid device-string) => identity)
(else (file-system-label device-string)))) (else (file-system-label device-string))))

2
gnu/machine/ssh.scm
View file

@ -172,6 +172,8 @@ (define file-systems
(and (file-system-mount? fs) (and (file-system-mount? fs)
(not (member (file-system-type fs) (not (member (file-system-type fs)
%pseudo-file-system-types)) %pseudo-file-system-types))
;; Don't try to validate network file systems.
(not (string-prefix? "nfs" (file-system-type fs)))
(not (memq 'bind-mount (file-system-flags fs))))) (not (memq 'bind-mount (file-system-flags fs)))))
(operating-system-file-systems (machine-operating-system machine)))) (operating-system-file-systems (machine-operating-system machine))))

12
gnu/system.scm
View file

@ -316,11 +316,13 @@ (define device-sexp->device
((? bytevector? bv) ;old format ((? bytevector? bv) ;old format
(bytevector->uuid bv 'dce)) (bytevector->uuid bv 'dce))
((? string? device) ((? string? device)
;; It used to be that we would not distinguish between labels and (if (string-contains device ":/")
;; device names. Try to infer the right thing here. device ; nfs-root
(if (string-prefix? "/dev/" device) ;; It used to be that we would not distinguish between labels and
device ;; device names. Try to infer the right thing here.
(file-system-label device))))) (if (string-prefix? "/" device)
device
(file-system-label device))))))
(match (read port) (match (read port)
(('boot-parameters ('version 0) (('boot-parameters ('version 0)