summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-04-02 22:46:18 +0200
committerLudovic Courtès <ludo@gnu.org>2020-04-02 23:15:12 +0200
commit5517750344be05c91bc2979c1a0e2348a9ae902d (patch)
tree7cf0944f880f2a180ac55678e691c9ba8aa919f1
parenta6850f6827869cd20feb1d4cc5abf6744b6cc164 (diff)
reconfigure: Run the effect scripts as separate processes.
Fixes <https://bugs.gnu.org/39301>. Reported by strypsteen@posteo.net. * guix/scripts/system/reconfigure.scm (switch-to-system) (upgrade-shepherd-services, install-bootloader): Use 'system*' instead of 'primitive-load'.
-rw-r--r--guix/scripts/system/reconfigure.scm22
1 files changed, 11 insertions, 11 deletions
diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm
index c8d1ed4a51..21b472e0c5 100644
--- a/guix/scripts/system/reconfigure.scm
+++ b/guix/scripts/system/reconfigure.scm
@@ -100,7 +100,7 @@ atomically, and run OS's activation script."
"Using EVAL, a monadic procedure taking a single G-Expression as an argument,
create a new generation of PROFILE pointing to the directory of OS, switch to
it atomically, and run OS's activation script."
- (eval #~(primitive-load #$(switch-system-program os profile))))
+ (eval #~(system* #$(switch-system-program os profile))))
;;;
@@ -176,10 +176,10 @@ services as defined by OS."
(map live-service-canonical-name
live-services)))
(service-files (map shepherd-service-file target-services)))
- (eval #~(primitive-load #$(upgrade-services-program service-files
- to-start
- to-unload
- to-restart)))))))
+ (eval #~(system* #$(upgrade-services-program service-files
+ to-start
+ to-unload
+ to-restart)))))))
;;;
@@ -252,9 +252,9 @@ additional configurations specified by MENU-ENTRIES can be selected."
(package (bootloader-package bootloader))
(device (bootloader-configuration-target configuration))
(bootcfg-file (bootloader-configuration-file bootloader)))
- (eval #~(primitive-load #$(install-bootloader-program installer
- package
- bootcfg
- bootcfg-file
- device
- target)))))
+ (eval #~(system* #$(install-bootloader-program installer
+ package
+ bootcfg
+ bootcfg-file
+ device
+ target)))))