From 370ae085b5107a0928fd744a987fb4070bdf6a00 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 21 Apr 2017 14:37:12 +0200 Subject: system: Use operating-system-boot-parameters directly. * gnu/system.scm (operating-system-bootcfg): Use operating-system-boot-parameters directly. --- gnu/system.scm | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) (limited to 'gnu') 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 @@ (define* (operating-system-bootcfg os #:optional (old-entries '())) (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 object, return a value suitable for use as the -- cgit v1.2.3