diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-04 23:16:17 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-04 23:16:17 +0100 |
| commit | ebb7cf9e21060105d9950dd5142c0eb918083666 (patch) | |
| tree | 36c1607b80d92e27fb9d09029d1d3b57a1fd5065 /gnu/system.scm | |
| parent | 0b870f7915f5da43758753fd088a22033936dc50 (diff) | |
| parent | c2d7e800e6788277bc56f31d5836f9d507dc1506 (diff) | |
| download | patches-ebb7cf9e21060105d9950dd5142c0eb918083666.tar patches-ebb7cf9e21060105d9950dd5142c0eb918083666.tar.gz | |
Merge branch 'master' into core-updates
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 d3f2b82519..42c0cd6f17 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"))) |