diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2017-04-02 15:52:29 +0200 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2017-04-15 14:41:10 +0200 |
| commit | c76b3046f651e8f46db1a093fdfc78cdc0bc3a13 (patch) | |
| tree | 4ac163734fea363405626ad2d3f3370e93f2f07a /guix/scripts | |
| parent | 03daeaa70fa9e248b1c20e79610c546e07b54ebf (diff) | |
| download | gnu-guix-c76b3046f651e8f46db1a093fdfc78cdc0bc3a13.tar gnu-guix-c76b3046f651e8f46db1a093fdfc78cdc0bc3a13.tar.gz | |
system: Rename operating-system-grub.cfg to operating-system-bootcfg.
* gnu/system.scm (operating-system-grub.cfg): Rename to...
(operating-system-bootcfg): ... this.
* gnu/system/vm.scm (system-disk-image): Use operating-system-bootcfg.
(system-qemu-image): Use operating-system-bootcfg.
(system-qemu-image/shared-store): Use operating-system-bootcfg.
* guix/scripts/system.scm (perform-action): Use operating-system-bootcfg.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
Diffstat (limited to 'guix/scripts')
| -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 8fe2a6b04e..a1c6d35909 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-grub.cfg os - (if (eq? 'init action) - '() - (profile-grub-entries))))) + (operating-system-bootcfg 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 |