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

scripts: system: Back out operating-system-bootcfg change. 

Follow-up to 475e2ce211.

* guix/scripts/system.scm (perform-action): Back out operating-system-bootcfg
change.
This commit is contained in:
Danny Milosavljevic 2017-04-15 13:49:37 +02:00
parent 32380cdbb1
commit 03daeaa70f
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
guix/scripts/system.scm
View File

@ -622,10 +622,10 @@ output when building a system derivation, such as a disk image."
(operating-system-bootloader os))))
(grub.cfg (if (eq? 'container action)
(return #f)
(operating-system-bootcfg os
(if (eq? 'init action)
'()
(profile-grub-entries)))))
(operating-system-grub.cfg os
(if (eq? 'init action)
'()
(profile-grub-entries)))))
;; For 'init' and 'reconfigure', always build GRUB.CFG, even if
;; --no-grub is passed, because GRUB.CFG because we then use it as a GC