diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-05-01 23:11:41 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-05-01 23:11:41 +0200 |
| commit | 3b458d5462e6bbd852c2dc5c6670d5655abf53f5 (patch) | |
| tree | 4f3ccec0de1c355134369333c17e948e3258d546 /guix/scripts/system.scm | |
| parent | 2ca3fdc2db1aef96fbf702a2f26f5e18ce832038 (diff) | |
| parent | 14da3daafc8dd92fdabd3367694c930440fd72cb (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts/system.scm')
| -rw-r--r-- | guix/scripts/system.scm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 97508f4bd6..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 @@ -1299,8 +1299,7 @@ argument list and OPTS is the option alist." (command (assoc-ref opts 'action))) (parameterize ((%graft? (assoc-ref opts 'graft?))) (with-status-verbosity (or (assoc-ref opts 'verbosity) - (if (memq command '(init reconfigure)) - 1 2)) + (if (eq? command 'build) 2 1)) (process-command command args opts)))))) ;;; Local Variables: |