Message ID | b027cd64bb8e1af2bced790a54ff09c86474cec3.1692569807.git.ngraves@ngraves.fr |
---|---|
State | New |
Headers | show |
Series | [bug#65335,v2,1/5] file-systems: canonicalize-device-name: Ignore the "none" case. | expand |
Hi, Nicolas Graves <ngraves@ngraves.fr> skribis: > --- > gnu/build/file-systems.scm | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm > index 36a59f5f5c..e39bd31c3b 100644 > --- a/gnu/build/file-systems.scm > +++ b/gnu/build/file-systems.scm > @@ -1021,8 +1021,8 @@ (define find-partition-by-luks-uuid > > (define (canonicalize-device-spec spec) > "Return the device name corresponding to SPEC, which can be a <uuid>, a > -<file-system-label>, or a string (typically a /dev file name or an nfs-root > -containing ':/')." > +<file-system-label>, the string 'none' or another string (typically a /dev > +file name or an nfs-root containing ':/')." LGTM. However, my offer to write commit logs on your behalf has expired, so I kindly invite you to write them. :-) See ‘C-x v l’ and the manual for details (info "(guix) Submitting Patches"). TIA! Ludo’.
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index 36a59f5f5c..e39bd31c3b 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -1021,8 +1021,8 @@ (define find-partition-by-luks-uuid (define (canonicalize-device-spec spec) "Return the device name corresponding to SPEC, which can be a <uuid>, a -<file-system-label>, or a string (typically a /dev file name or an nfs-root -containing ':/')." +<file-system-label>, the string 'none' or another string (typically a /dev +file name or an nfs-root containing ':/')." (define max-trials ;; Number of times we retry partition label resolution, 1 second per ;; trial. Note: somebody reported a delay of 16 seconds (!) before their @@ -1046,8 +1046,8 @@ (define (canonicalize-device-spec spec) (match spec ((? string?) - (if (string-contains spec ":/") - spec ; do not resolve NFS devices + (if (or (string-contains spec ":/") (string=? spec "none")) + spec ; do not resolve NFS / tmpfs devices ;; Nothing to do, but wait until SPEC shows up. (resolve identity spec identity))) ((? file-system-label?)