summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-04-03 10:26:54 +0200
committerLudovic Courtès <ludo@gnu.org>2020-04-03 12:58:14 +0200
commit00a1ebb84a5664cae1fbe0a0845d65c99d9907f1 (patch)
tree81564bbe926abdf0d41eb3495872546a010fd479
parent28f6f1e0da2481ce854a893d72d6bdfc5ce97952 (diff)
Revert "reconfigure: Run the effect scripts as separate processes."
This reverts commit 5517750344be05c91bc2979c1a0e2348a9ae902d. That commit would remove all sorts of error checking when running those programs.
-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 21b472e0c5..c8d1ed4a51 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 #~(system* #$(switch-system-program os profile))))
+ (eval #~(primitive-load #$(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 #~(system* #$(upgrade-services-program service-files
- to-start
- to-unload
- to-restart)))))))
+ (eval #~(primitive-load #$(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 #~(system* #$(install-bootloader-program installer
- package
- bootcfg
- bootcfg-file
- device
- target)))))
+ (eval #~(primitive-load #$(install-bootloader-program installer
+ package
+ bootcfg
+ bootcfg-file
+ device
+ target)))))