From 00a1ebb84a5664cae1fbe0a0845d65c99d9907f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 3 Apr 2020 10:26:54 +0200 Subject: [PATCH] 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. --- guix/scripts/system/reconfigure.scm | 22 +++++++++++----------- 1 file 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 @@ (define* (switch-to-system eval os #:optional profile) "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 @@ (define target-services (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 @@ (define* (install-bootloader eval configuration bootcfg (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)))))