summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-04-23 23:39:07 +0200
committerLudovic Courtès <ludo@gnu.org>2019-04-23 23:44:35 +0200
commitaf41e504cf0e4039615015cc49baa947e1715c47 (patch)
tree94c5c0f299ca2f9b6d4e1833b1e3a2461e76df0a
parente01bd1a67447c1f2a2b5b03e8ea8fbbccd2cd5bd (diff)
downloadpatches-af41e504cf0e4039615015cc49baa947e1715c47.tar
patches-af41e504cf0e4039615015cc49baa947e1715c47.tar.gz
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.
-rw-r--r--guix/scripts/system.scm2
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 78aa6cf644..3c3d6cbd5f 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