nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

guix system: Simplify bootloader package handling. 

* guix/scripts/system.scm (perform-action): Remove 'bootloader-package'
variable.  Pass (bootloader-package bootloader) as the 2nd argument to
'bootloader-installer-derivation'.  Remove BOOTLOADER-PACKAGE from DRVS
since it's redundant.
This commit is contained in:
Ludovic Courtès 2018-11-16 09:15:15 +01:00
parent 8bff7dc2ad
commit 6e47628d4c
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
guix/scripts/system.scm
View File

@ -851,11 +851,6 @@ static checks."
#:mappings mappings)) #:mappings mappings))
(bootloader -> (bootloader-configuration-bootloader (bootloader -> (bootloader-configuration-bootloader
(operating-system-bootloader os))) (operating-system-bootloader os)))
(bootloader-package
(let ((package (bootloader-package bootloader)))
(if package
(package->derivation package)
(return #f))))
(bootcfg (if (eq? 'container action) (bootcfg (if (eq? 'container action)
(return #f) (return #f)
(lower-object (lower-object
@ -870,17 +865,15 @@ static checks."
(let ((installer (bootloader-installer bootloader)) (let ((installer (bootloader-installer bootloader))
(target (or target "/"))) (target (or target "/")))
(bootloader-installer-derivation installer (bootloader-installer-derivation installer
bootloader-package (bootloader-package bootloader)
bootloader-target target))) bootloader-target target)))
;; For 'init' and 'reconfigure', always build BOOTCFG, even if ;; For 'init' and 'reconfigure', always build BOOTCFG, even if
;; --no-bootloader is passed, because we then use it as a GC root. ;; --no-bootloader is passed, because we then use it as a GC root.
;; See <http://bugs.gnu.org/21068>. ;; See <http://bugs.gnu.org/21068>.
(drvs -> (if (memq action '(init reconfigure)) (drvs -> (if (memq action '(init reconfigure))
(if (and install-bootloader? bootloader-package) (if install-bootloader?
(list sys bootcfg (list sys bootcfg bootloader-installer)
bootloader-package
bootloader-installer)
(list sys bootcfg)) (list sys bootcfg))
(list sys))) (list sys)))
(% (if derivations-only? (% (if derivations-only?