diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-01-20 22:12:10 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-01-20 22:12:10 +0100 |
| commit | 3e2d4e69c340c3520f546f8c7e21e52383058d1c (patch) | |
| tree | 0bc92edb753cfdf9a9e7ef763ebc19f0cd2d528c /gnu/bootloader.scm | |
| parent | ad79ae7e2d7505292b11e87302b08f4db0f934e9 (diff) | |
| parent | e5ad2cdf172eecc7edef37a500593b1941af013c (diff) | |
| download | guix-3e2d4e69c340c3520f546f8c7e21e52383058d1c.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/bootloader.scm')
| -rw-r--r-- | gnu/bootloader.scm | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm index 4f2c71cb5a..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 - (warning - (G_ "The 'device' field of bootloader configurations is deprecated.~%")) - (warning (G_ "Use 'target' instead.~%"))) - device))) - ;;; ;;; Bootloaders. |