[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/09: system: Use operating-system-boot-parameters directly.
From: |
Danny Milosavljevic |
Subject: |
06/09: system: Use operating-system-boot-parameters directly. |
Date: |
Fri, 5 May 2017 09:10:31 -0400 (EDT) |
dannym pushed a commit to branch master
in repository guix.
commit 370ae085b5107a0928fd744a987fb4070bdf6a00
Author: Danny Milosavljevic <address@hidden>
Date: Fri Apr 21 14:37:12 2017 +0200
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(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index f213379..38b9367 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
- branch master updated (3339abf -> 360874d), Danny Milosavljevic, 2017/05/05
- 05/09: system: vm: Use operating-system-kernel-arguments., Danny Milosavljevic, 2017/05/05
- 02/09: system: Introduce operating-system-kernel-arguments and use it., Danny Milosavljevic, 2017/05/05
- 01/09: system: Factorize operating-system-boot-parameters-file., Danny Milosavljevic, 2017/05/05
- 06/09: system: Use operating-system-boot-parameters directly.,
Danny Milosavljevic <=
- 07/09: system: grub: Use boot-parameters instead of menu-entry where possible., Danny Milosavljevic, 2017/05/05
- 03/09: system: Introduce read-boot-parameters-file., Danny Milosavljevic, 2017/05/05
- 04/09: scripts: Make boot-parameters label include generation number and time., Danny Milosavljevic, 2017/05/05
- 08/09: scripts: Remove profile-grub-entries., Danny Milosavljevic, 2017/05/05
- 09/09: system: Clarify that SYSTEM is either a derivation or #f., Danny Milosavljevic, 2017/05/05