guix-commits
[Top][All Lists]
Advanced

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

01/08: guix system: Compute 'bootcfg' only for 'init' and 'reconfigure'.


From: guix-commits
Subject: 01/08: guix system: Compute 'bootcfg' only for 'init' and 'reconfigure'.
Date: Tue, 23 Apr 2019 18:36:18 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit af41e504cf0e4039615015cc49baa947e1715c47
Author: Ludovic Court├Ęs <address@hidden>
Date:   Tue Apr 23 23:39:07 2019 +0200

    guix system: Compute 'bootcfg' only for 'init' and 'reconfigure'.
    
    Previously, 'guix system vm' would start by computing the bootcfg
    derivation, which itself depended on an incorrect OS derivation (for the
    original OS instead of the one passed through
    'virtualized-operating-system'.)  That added overhead and would force
    the user's config file to define a root file system, for example, even
    though it makes no sense in the case of a VM.
    
    * guix/scripts/system.scm (perform-action)[bootcfg]: Limit to the 'init'
    and 'reconfigure' actions.
---
 guix/scripts/system.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 78aa6cf..3c3d6cb 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -855,7 +855,7 @@ static checks."
     (bootloader-configuration-bootloader (operating-system-bootloader os)))
 
   (define bootcfg
-    (and (not (eq? 'container action))
+    (and (memq action '(init reconfigure))
          (operating-system-bootcfg os menu-entries)))
 
   (define bootloader-script



reply via email to

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