me
/
guix
Archived
1
0
Fork 0
Code

system: Use operating-system-boot-parameters directly. 

* gnu/system.scm (operating-system-bootcfg): Use
operating-system-boot-parameters directly.
master
Danny Milosavljevic 2017-04-21 14:37:12 +02:00
parent 83071b052a
commit 370ae085b5
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gnu/system.scm
View File

@ -750,33 +750,13 @@ populate the \"old entries\" menu."
(mlet* %store-monad (mlet* %store-monad
((system (operating-system-derivation os)) ((system (operating-system-derivation os))
(root-fs -> (operating-system-root-file-system os)) (root-fs -> (operating-system-root-file-system os))
(store-fs -> (operating-system-store-file-system os))
(label -> (kernel->boot-label (operating-system-kernel os)))
(kernel -> (operating-system-kernel-file os))
(initrd (operating-system-initrd-file os))
(root-device -> (if (eq? 'uuid (file-system-title root-fs)) (root-device -> (if (eq? 'uuid (file-system-title root-fs))
(uuid->string (file-system-device root-fs)) (uuid->string (file-system-device root-fs))
(file-system-device root-fs))) (file-system-device root-fs)))
(entries -> (list (menu-entry (entry (operating-system-boot-parameters os system root-device)))
(label label) (grub-configuration-file (operating-system-bootloader os)
(list entry)
;; The device where the kernel and initrd live. #:old-entries old-entries)))
(device (fs->boot-device store-fs))
(device-mount-point
(file-system-mount-point store-fs))
(linux kernel)
(linux-arguments
(cons* (string-append "--root=" root-device)
#~(string-append "--system=" #$system)
#~(string-append "--load=" #$system
"/boot")
(operating-system-kernel-arguments os
system
root-device)))
(initrd initrd)))))
(grub-configuration-file (operating-system-bootloader os) entries
#:old-entries old-entries)))
(define (fs->boot-device fs) (define (fs->boot-device fs)
"Given FS, a <file-system> object, return a value suitable for use as the "Given FS, a <file-system> object, return a value suitable for use as the