diff options
| author | Andy Wingo <wingo@igalia.com> | 2017-08-23 21:48:58 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@igalia.com> | 2017-08-23 22:23:19 +0200 |
| commit | 045ebb3e58d74c75f39ce47380045d3cd00359c3 (patch) | |
| tree | 2e2b805a7764bd7049bddb417c9d6ccf9ce83653 /gnu/bootloader.scm | |
| parent | ba015ce9c04e2cd8e686add647109b514c3fa244 (diff) | |
gnu: bootloader: Deprecate "device" field in favor of "target".
* gnu/bootloader.scm (<bootloader-configuration>): Deprecate "device" field in
favor of "target" field. This is mostly a renaming but also a generalization
to support UEFI targets being paths to a mounted partition instead of a device
name.
* gnu/system/examples/bare-bones.tmpl:
* gnu/system/examples/desktop.tmpl:
* gnu/system/examples/lightweight-desktop.tmpl:
* gnu/system/examples/vm-image.tmpl:
* gnu/system/install.scm:
* gnu/tests.scm:
* gnu/tests/install.scm:
* gnu/tests/nfs.scm:
* tests/system.scm: Adapt all invocations of bootloader-configuration.
* guix/scripts/system.scm (perform-action): Rename device argument to
bootloader-target.
(process-action): Adapt caller.
* doc/guix.texi (Proceeding with the Installation):
* doc/guix.texi (Bootloader Configuration): Update documentation.
Diffstat (limited to 'gnu/bootloader.scm')
| -rw-r--r-- | gnu/bootloader.scm | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm index e080b04568b..122e3508746 100644 --- a/gnu/bootloader.scm +++ b/gnu/bootloader.scm | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | bootloader-configuration | 43 | bootloader-configuration |
| 44 | bootloader-configuration? | 44 | bootloader-configuration? |
| 45 | bootloader-configuration-bootloader | 45 | bootloader-configuration-bootloader |
| 46 | bootloader-configuration-device | 46 | bootloader-configuration-target |
| 47 | bootloader-configuration-menu-entries | 47 | bootloader-configuration-menu-entries |
| 48 | bootloader-configuration-default-entry | 48 | bootloader-configuration-default-entry |
| 49 | bootloader-configuration-timeout | 49 | bootloader-configuration-timeout |
| @@ -107,6 +107,8 @@ | |||
| 107 | (bootloader bootloader-configuration-bootloader) ; <bootloader> | 107 | (bootloader bootloader-configuration-bootloader) ; <bootloader> |
| 108 | (device bootloader-configuration-device ; string | 108 | (device bootloader-configuration-device ; string |
| 109 | (default #f)) | 109 | (default #f)) |
| 110 | (target %bootloader-configuration-target ; string | ||
| 111 | (default #f)) | ||
| 110 | (menu-entries bootloader-configuration-menu-entries ; list of <boot-parameters> | 112 | (menu-entries bootloader-configuration-menu-entries ; list of <boot-parameters> |
| 111 | (default '())) | 113 | (default '())) |
| 112 | (default-entry bootloader-configuration-default-entry ; integer | 114 | (default-entry bootloader-configuration-default-entry ; integer |
| @@ -126,6 +128,15 @@ | |||
| 126 | (additional-configuration bootloader-configuration-additional-configuration ; record | 128 | (additional-configuration bootloader-configuration-additional-configuration ; record |
| 127 | (default #f))) | 129 | (default #f))) |
| 128 | 130 | ||
| 131 | (define (bootloader-configuration-target config) | ||
| 132 | (or (%bootloader-configuration-target config) | ||
| 133 | (let ((device (bootloader-configuration-device config))) | ||
| 134 | (when device | ||
| 135 | (issue-deprecation-warning | ||
| 136 | "The 'device' field of bootloader configurations is deprecated." | ||
| 137 | "Use 'target' instead.")) | ||
| 138 | device))) | ||
| 139 | |||
| 129 | 140 | ||
| 130 | ;;; | 141 | ;;; |
| 131 | ;;; Bootloaders. | 142 | ;;; Bootloaders. |
