diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-04 12:04:42 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-04 12:04:42 +0100 |
| commit | e32aea5472007507e62933b27a4db9a50810e5dc (patch) | |
| tree | 55ccbe4ed5baf1fd2689b16d7108da8f7be857a9 /gnu/system.scm | |
| parent | fb98351621a6b311d4ff9593d6c22d40a3b3fe8f (diff) | |
| parent | d46f9f833b190aac04f7f4683b84a06a291a3f8f (diff) | |
| download | guix-patches-e32aea5472007507e62933b27a4db9a50810e5dc.tar guix-patches-e32aea5472007507e62933b27a4db9a50810e5dc.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 01baa248a2..2e6d03272d 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -142,16 +142,11 @@ (define (bootable-kernel-arguments system root-device) "Return a list of kernel arguments (gexps) to boot SYSTEM from ROOT-DEVICE." (list (string-append "--root=" - (cond ((uuid? root-device) - - ;; Note: Always use the DCE format because that's - ;; what (gnu build linux-boot) expects for the - ;; '--root' kernel command-line option. - (uuid->string (uuid-bytevector root-device) - 'dce)) - ((file-system-label? root-device) - (file-system-label->string root-device)) - (else root-device))) + ;; Note: Always use the DCE format because that's what + ;; (gnu build linux-boot) expects for the '--root' + ;; kernel command-line option. + (file-system-device->string root-device + #:uuid-type 'dce)) #~(string-append "--system=" #$system) #~(string-append "--load=" #$system "/boot"))) |