diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2017-04-15 13:49:37 +0200 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2017-04-15 14:41:10 +0200 |
| commit | 03daeaa70fa9e248b1c20e79610c546e07b54ebf (patch) | |
| tree | b34fecdafe5f64126b424e04bc6a7815de77ab48 | |
| parent | 32380cdbb12065f2ae4f7cf595d073181b99f18d (diff) | |
| download | guix-03daeaa70fa9e248b1c20e79610c546e07b54ebf.tar guix-03daeaa70fa9e248b1c20e79610c546e07b54ebf.tar.gz | |
scripts: system: Back out operating-system-bootcfg change.
Follow-up to 475e2ce211ac05a814c1f1bc2b9648baa17ad369.
* guix/scripts/system.scm (perform-action): Back out operating-system-bootcfg
change.
| -rw-r--r-- | guix/scripts/system.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index a1c6d35909..8fe2a6b04e 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -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 |