nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

linux-initrd: Gracefully deal with partitions with no label. 

* guix/build/linux-initrd.scm (partition-label-predicate): Check whether
  'ext2-superblock-volume-name' returns #f, and return #f if it does.
This commit is contained in:
Ludovic Courtès 2014-05-31 15:55:38 +02:00
parent b0e3635e0a
commit 1bb784ea05
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
guix/build/linux-initrd.scm
View File

@ -180,8 +180,9 @@ return #t if that partition's volume name is LABEL."
(let* ((device (string-append "/dev/" part))
(sblock (read-ext2-superblock device)))
(and sblock
(string=? (ext2-superblock-volume-name sblock)
label)))))
(let ((volume (ext2-superblock-volume-name sblock)))
(and volume
(string=? volume label)))))))
(define (find-partition-by-label label)
"Return the first partition found whose volume name is LABEL, or #f if none