diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2017-04-21 14:37:12 +0200 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2017-05-05 15:03:47 +0200 |
| commit | 370ae085b5107a0928fd744a987fb4070bdf6a00 (patch) | |
| tree | 0b58eebcf5b3a3106a71c737c217ac0464bbfd83 /gnu | |
| parent | 83071b052a0585f7166245b7ba793436e104f8fe (diff) | |
| download | guix-370ae085b5107a0928fd744a987fb4070bdf6a00.tar.gz | |
system: Use operating-system-boot-parameters directly.
* gnu/system.scm (operating-system-bootcfg): Use operating-system-boot-parameters directly.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/system.scm | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index f213379f03..38b936787f 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -750,33 +750,13 @@ populate the \"old entries\" menu." (mlet* %store-monad ((system (operating-system-derivation 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)) (uuid->string (file-system-device root-fs)) (file-system-device root-fs))) - (entries -> (list (menu-entry - (label label) - - ;; The device where the kernel and initrd live. - (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))) + (entry (operating-system-boot-parameters os system root-device))) + (grub-configuration-file (operating-system-bootloader os) + (list entry) + #:old-entries old-entries))) (define (fs->boot-device fs) "Given FS, a <file-system> object, return a value suitable for use as the |