aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@igalia.com>2017-08-23 21:26:05 +0200
committerAndy Wingo <wingo@igalia.com>2017-08-23 22:23:06 +0200
commitba015ce9c04e2cd8e686add647109b514c3fa244 (patch)
tree36194cb52ef83eeb6da6f0b2c05536e9e013c7a3
parentf81039058cb2c7b0b4986109fca584a87112a9b9 (diff)
downloadguix-ba015ce9c04e2cd8e686add647109b514c3fa244.tar.gz
guix-ba015ce9c04e2cd8e686add647109b514c3fa244.zip
gnu: scripts: Cleanup regarding "gnu system" bootloader devices.
* guix/scripts/system.scm (install-bootloader, install): Remove unused "device" argument. (reinstall-bootloader, perform-action): Adapt callers.
-rw-r--r--guix/scripts/system.scm19
1 files changed, 7 insertions, 12 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 5a2811e75b..44d2c8f20c 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -150,7 +150,7 @@ TARGET, and register them."
(define* (install-bootloader installer-drv
#:key
bootcfg bootcfg-file
- device target)
+ target)
"Call INSTALLER-DRV with error handling, in %STORE-MONAD."
(with-monad %store-monad
(let* ((gc-root (string-append target %gc-roots-directory
@@ -169,7 +169,7 @@ TARGET, and register them."
(when install
(save-load-path-excursion (primitive-load install)))))
(delete-file temp-gc-root)
- (leave (G_ "failed to install bootloader on device ~a '~a'~%") install device))
+ (leave (G_ "failed to install bootloader ~a~%") install))
;; Register bootloader config file as a GC root so that its dependencies
;; (background image, font, etc.) are not reclaimed.
@@ -179,13 +179,12 @@ TARGET, and register them."
(define* (install os-drv target
#:key (log-port (current-output-port))
bootloader-installer install-bootloader?
- bootcfg bootcfg-file
- device)
+ bootcfg bootcfg-file)
"Copy the closure of BOOTCFG, which includes the output of OS-DRV, to
directory TARGET. TARGET must be an absolute directory name since that's what
'guix-register' expects.
-When INSTALL-BOOTLOADER? is true, install bootloader on DEVICE, using BOOTCFG."
+When INSTALL-BOOTLOADER? is true, install bootloader using BOOTCFG."
(define (maybe-copy to-copy)
(with-monad %store-monad
(if (string=? target "/")
@@ -227,7 +226,6 @@ the ownership of '~a' may be incorrect!~%")
(install-bootloader bootloader-installer
#:bootcfg bootcfg
#:bootcfg-file bootcfg-file
- #:device device
#:target target)))))
@@ -457,12 +455,11 @@ STORE is an open connection to the store."
(mbegin %store-monad
(show-what-to-build* drvs)
(built-derivations drvs)
- ;; Only install bootloader configuration file. Thus, no installer
- ;; nor device is provided here.
+ ;; Only install bootloader configuration file. Thus, no installer is
+ ;; provided here.
(install-bootloader #f
#:bootcfg bootcfg
#:bootcfg-file bootcfg-file
- #:device #f
#:target target))))))
@@ -697,7 +694,6 @@ output when building a system derivation, such as a disk image."
(install-bootloader bootloader-installer
#:bootcfg bootcfg
#:bootcfg-file bootcfg-file
- #:device device
#:target "/"))))
((init)
(newline)
@@ -707,8 +703,7 @@ output when building a system derivation, such as a disk image."
#:install-bootloader? install-bootloader?
#:bootcfg bootcfg
#:bootcfg-file bootcfg-file
- #:bootloader-installer bootloader-installer
- #:device device))
+ #:bootloader-installer bootloader-installer))
(else
;; All we had to do was to build SYS and maybe register an
;; indirect GC root.