me/guix
Archived
1
0
Fork 0
Code Activity

reconfigure: Silence Guile warnings.

Browse source 
Fixes <https://bugs.gnu.org/39301>.
Reported by strypsteen@posteo.net.

* guix/scripts/system/reconfigure.scm (switch-to-system)
(upgrade-shepherd-services, install-bootloader): Wrap 'primitive-load'
call in 'parameterize'.
This commit is contained in:
Ludovic Courtès 2020-04-03 10:48:32 +02:00
parent 00a1ebb84a
commit 9fb3ff31c1
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
guix/scripts/system/reconfigure.scm
View file

@ -100,7 +100,8 @@ atomically, and run OS's activation script."
"Using EVAL, a monadic procedure taking a single G-Expression as an argument, "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 create a new generation of PROFILE pointing to the directory of OS, switch to
it atomically, and run OS's activation script." it atomically, and run OS's activation script."
(eval #~(primitive-load #$(switch-system-program os profile)))) (eval #~(parameterize ((current-warning-port (%make-void-port "w")))
(primitive-load #$(switch-system-program os profile)))))
;;; ;;;
@ -176,10 +177,11 @@ services as defined by OS."
(map live-service-canonical-name (map live-service-canonical-name
live-services))) live-services)))
(service-files (map shepherd-service-file target-services))) (service-files (map shepherd-service-file target-services)))
(eval #~(primitive-load #$(upgrade-services-program service-files (eval #~(parameterize ((current-warning-port (%make-void-port "w")))
to-start (primitive-load #$(upgrade-services-program service-files
to-unload to-start
to-restart))))))) to-unload
to-restart))))))))
;;; ;;;
@ -252,9 +254,10 @@ additional configurations specified by MENU-ENTRIES can be selected."
(package (bootloader-package bootloader)) (package (bootloader-package bootloader))
(device (bootloader-configuration-target configuration)) (device (bootloader-configuration-target configuration))
(bootcfg-file (bootloader-configuration-file bootloader))) (bootcfg-file (bootloader-configuration-file bootloader)))
(eval #~(primitive-load #$(install-bootloader-program installer (eval #~(parameterize ((current-warning-port (%make-void-port "w")))
package (primitive-load #$(install-bootloader-program installer
bootcfg package
bootcfg-file bootcfg
device bootcfg-file
target))))) device
target))))))