diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-01-16 13:42:34 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-01-16 14:07:38 +0100 |
| commit | 5f7467f046c3c1648cdf6eb81b3ec041bfc1f9bb (patch) | |
| tree | ccd688d6e2ab7082b532167fdb4570f920cb3631 | |
| parent | 5c215c9e4777023e0cf89511742a6055411d6de2 (diff) | |
bootloader: Remove deprecated 'device' field.
The 'device' field had been deprecated in commit
045ebb3e58d74c75f39ce47380045d3cd00359c3 (August 2017).
* gnu/bootloader.scm (<bootloader-configuration>)[device]: Remove.
[target]: Change getter to 'bootstrap-configuration-target'.
(bootstrap-configuration-target): Remove.
| -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 4f2c71cb5a5..a32bf5ec672 100644 --- a/gnu/bootloader.scm +++ b/gnu/bootloader.scm | |||
| @@ -105,9 +105,7 @@ | |||
| 105 | bootloader-configuration make-bootloader-configuration | 105 | bootloader-configuration make-bootloader-configuration |
| 106 | bootloader-configuration? | 106 | bootloader-configuration? |
| 107 | (bootloader bootloader-configuration-bootloader) ; <bootloader> | 107 | (bootloader bootloader-configuration-bootloader) ; <bootloader> |
| 108 | (device bootloader-configuration-device ; string | 108 | (target bootloader-configuration-target ; string |
| 109 | (default #f)) | ||
| 110 | (target %bootloader-configuration-target ; string | ||
| 111 | (default #f)) | 109 | (default #f)) |
| 112 | (menu-entries bootloader-configuration-menu-entries ; list of <boot-parameters> | 110 | (menu-entries bootloader-configuration-menu-entries ; list of <boot-parameters> |
| 113 | (default '())) | 111 | (default '())) |
| @@ -128,15 +126,6 @@ | |||
| 128 | (additional-configuration bootloader-configuration-additional-configuration ; record | 126 | (additional-configuration bootloader-configuration-additional-configuration ; record |
| 129 | (default #f))) | 127 | (default #f))) |
| 130 | 128 | ||
| 131 | (define (bootloader-configuration-target config) | ||
| 132 | (or (%bootloader-configuration-target config) | ||
| 133 | (let ((device (bootloader-configuration-device config))) | ||
| 134 | (when device | ||
| 135 | (warning | ||
| 136 | (G_ "The 'device' field of bootloader configurations is deprecated.~%")) | ||
| 137 | (warning (G_ "Use 'target' instead.~%"))) | ||
| 138 | device))) | ||
| 139 | |||
| 140 | 129 | ||
| 141 | ;;; | 130 | ;;; |
| 142 | ;;; Bootloaders. | 131 | ;;; Bootloaders. |
