X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/72e2815d18ad688b0a16ce3b3efba1172423cec4..dd7bc92afcd4b69849fc55041ac0261315cde2da:/gnu/bootloader.scm

diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm
index 122e350874..a32bf5ec67 100644
--- a/gnu/bootloader.scm
+++ b/gnu/bootloader.scm
@@ -105,9 +105,7 @@
   bootloader-configuration make-bootloader-configuration
   bootloader-configuration?
   (bootloader                      bootloader-configuration-bootloader)    ; <bootloader>
-  (device                          bootloader-configuration-device         ; string
-                                   (default #f))
-  (target                          %bootloader-configuration-target         ; string
+  (target                          bootloader-configuration-target         ; string
                                    (default #f))
   (menu-entries                    bootloader-configuration-menu-entries   ; list of <boot-parameters>
                                    (default '()))
@@ -128,15 +126,6 @@
   (additional-configuration        bootloader-configuration-additional-configuration ; record
                                    (default #f)))
 
-(define (bootloader-configuration-target config)
-  (or (%bootloader-configuration-target config)
-      (let ((device (bootloader-configuration-device config)))
-        (when device
-          (issue-deprecation-warning
-           "The 'device' field of bootloader configurations is deprecated."
-           "Use 'target' instead."))
-        device)))
-
 
 ;;;
 ;;; Bootloaders.
@@ -146,7 +135,8 @@
   "Return the list of bootloader modules."
   (all-modules (map (lambda (entry)
                       `(,entry . "gnu/bootloader"))
-                    %load-path)))
+                    %load-path)
+               #:warn warn-about-load-error))
 
 (define %bootloaders
   ;; The list of publically-known bootloaders.