me
/
guix
Archived
1
0
Fork 0
Code

vm: Allow partitions to be initialized with a given UUID. 

* gnu/build/vm.scm (<partition>)[uuid]: New field.
(create-ext-file-system): Add #:uuid and honor it.
(create-fat-file-system): Add #:uuid.
(format-partition): Add #:uuid and honor it.
(initialize-partition): Honor the 'uuid' field of PARTITION.
master
Ludovic Courtès 2017-07-20 00:15:43 +02:00
parent 007b92cfc0
commit bae28ccb69
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gnu/build/vm.scm
View File

@ -163,6 +163,7 @@ the #:references-graphs parameter of 'derivation'."
(size partition-size) (size partition-size)
(file-system partition-file-system (default "ext4")) (file-system partition-file-system (default "ext4"))
(label partition-label (default #f)) (label partition-label (default #f))
(uuid partition-uuid (default #f))
(flags partition-flags (default '())) (flags partition-flags (default '()))
(initializer partition-initializer (default (const #t)))) (initializer partition-initializer (default (const #t))))
@ -236,22 +237,26 @@ actual /dev name based on DEVICE."
(define MS_BIND 4096) ; <sys/mounts.h> again! (define MS_BIND 4096) ; <sys/mounts.h> again!
(define* (create-ext-file-system partition type (define* (create-ext-file-system partition type
#:key label) #:key label uuid)
"Create an ext-family filesystem of TYPE on PARTITION. If LABEL is true, "Create an ext-family filesystem of TYPE on PARTITION. If LABEL is true,
use that as the volume name." use that as the volume name. If UUID is true, use it as the partition UUID."
(format #t "creating ~a partition...\n" type) (format #t "creating ~a partition...\n" type)
(unless (zero? (apply system* (string-append "mkfs." type) (unless (zero? (apply system* (string-append "mkfs." type)
"-F" partition "-F" partition
(if label `(,@(if label
`("-L" ,label) `("-L" ,label)
'()))) '())
,@(if uuid
`("-U" ,(uuid->string uuid))
'()))))
(error "failed to create partition"))) (error "failed to create partition")))
(define* (create-fat-file-system partition (define* (create-fat-file-system partition
#:key label) #:key label uuid)
"Create a FAT filesystem on PARTITION. The number of File Allocation Tables "Create a FAT filesystem on PARTITION. The number of File Allocation Tables
will be determined based on filesystem size. If LABEL is true, use that as the will be determined based on filesystem size. If LABEL is true, use that as the
volume name." volume name."
;; FIXME: UUID is ignored!
(format #t "creating FAT partition...\n") (format #t "creating FAT partition...\n")
(unless (zero? (apply system* "mkfs.fat" partition (unless (zero? (apply system* "mkfs.fat" partition
(if label (if label
@ -260,13 +265,13 @@ volume name."
(error "failed to create FAT partition"))) (error "failed to create FAT partition")))
(define* (format-partition partition type (define* (format-partition partition type
#:key label) #:key label uuid)
"Create a file system TYPE on PARTITION. If LABEL is true, use that as the "Create a file system TYPE on PARTITION. If LABEL is true, use that as the
volume name." volume name."
(cond ((string-prefix? "ext" type) (cond ((string-prefix? "ext" type)
(create-ext-file-system partition type #:label label)) (create-ext-file-system partition type #:label label #:uuid uuid))
((or (string-prefix? "fat" type) (string= "vfat" type)) ((or (string-prefix? "fat" type) (string= "vfat" type))
(create-fat-file-system partition #:label label)) (create-fat-file-system partition #:label label #:uuid uuid))
(else (error "Unsupported file system.")))) (else (error "Unsupported file system."))))
(define (initialize-partition partition) (define (initialize-partition partition)
@ -275,7 +280,8 @@ it, run its initializer, and unmount it."
(let ((target "/fs")) (let ((target "/fs"))
(format-partition (partition-device partition) (format-partition (partition-device partition)
(partition-file-system partition) (partition-file-system partition)
#:label (partition-label partition)) #:label (partition-label partition)
#:uuid (partition-uuid partition))
(mkdir-p target) (mkdir-p target)
(mount (partition-device partition) target (mount (partition-device partition) target
(partition-file-system partition)) (partition-file-system partition))