guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/04: scripts: system: Back out operating-system-bootcfg change.


From: Danny Milosavljevic
Subject: 01/04: scripts: system: Back out operating-system-bootcfg change.
Date: Sat, 15 Apr 2017 08:43:12 -0400 (EDT)

dannym pushed a commit to branch master
in repository guix.

commit 03daeaa70fa9e248b1c20e79610c546e07b54ebf
Author: Danny Milosavljevic <address@hidden>
Date:   Sat Apr 15 13:49:37 2017 +0200

    scripts: system: Back out operating-system-bootcfg change.
    
    Follow-up to 475e2ce211ac05a814c1f1bc2b9648baa17ad369.
    
    * guix/scripts/system.scm (perform-action): Back out 
operating-system-bootcfg
    change.
---
 guix/scripts/system.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index a1c6d35..8fe2a6b 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]