diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2017-06-10 10:47:25 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2017-06-10 18:32:11 +0200 |
| commit | f96752e378e924b44f75f642104956314d7d5fe5 (patch) | |
| tree | b0ca9d06d0a5b60821aa1cd8f09fa33b81c2dbff /gnu/system.scm | |
| parent | 9a0968816f831ee6bc2343c3aca254bbbf9958cc (diff) | |
| download | guix-f96752e378e924b44f75f642104956314d7d5fe5.tar guix-f96752e378e924b44f75f642104956314d7d5fe5.tar.gz | |
bootloader: Rename boot-name to bootloader-name.
* gnu/system (<boot-parameters>)[boot-name]: Rename field to...
[bootloader-name]: ... this. Adjust users.
* gnu/scripts/system.scm: Adjust accordingly.
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 674c6f85be..fad5cf662c 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -104,7 +104,7 @@ boot-parameters? boot-parameters-label boot-parameters-root-device - boot-parameters-boot-name + boot-parameters-bootloader-name boot-parameters-store-device boot-parameters-store-mount-point boot-parameters-kernel @@ -216,7 +216,7 @@ directly by the user." ;; exactly to the device field of the <file-system> object representing the ;; OS's root file system, so it might be a device path like "/dev/sda3". (root-device boot-parameters-root-device) - (boot-name boot-parameters-boot-name) + (bootloader-name boot-parameters-bootloader-name) (store-device boot-parameters-store-device) (store-mount-point boot-parameters-store-mount-point) (kernel boot-parameters-kernel) @@ -235,8 +235,8 @@ directly by the user." (label label) (root-device root) - (boot-name - (match (assq 'boot-name rest) + (bootloader-name + (match (assq 'bootloader-name rest) ((_ args) args) (#f 'grub))) ; for compatibility reasons. @@ -892,7 +892,7 @@ kernel arguments for that derivation to <boot-parameters>." (store -> (operating-system-store-file-system os)) (bootloader -> (bootloader-configuration-bootloader (operating-system-bootloader os))) - (boot-name -> (bootloader-name bootloader)) + (bootloader-name -> (bootloader-name bootloader)) (label -> (kernel->boot-label (operating-system-kernel os)))) (return (boot-parameters (label label) @@ -903,7 +903,7 @@ kernel arguments for that derivation to <boot-parameters>." (operating-system-kernel-arguments os system.drv root-device) (operating-system-user-kernel-arguments os))) (initrd initrd) - (boot-name boot-name) + (bootloader-name bootloader-name) (store-device (fs->boot-device store)) (store-mount-point (file-system-mount-point store)))))) @@ -929,7 +929,7 @@ being stored into the \"parameters\" file)." (kernel-arguments #$(boot-parameters-kernel-arguments params)) (initrd #$(boot-parameters-initrd params)) - (boot-name #$(boot-parameters-boot-name params)) + (bootloader-name #$(boot-parameters-bootloader-name params)) (store (device #$(boot-parameters-store-device params)) (mount-point #$(boot-parameters-store-mount-point params)))) |