summary refs log tree commit diff
path: root/gnu/system.scm
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2020-05-27 22:44:28 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2020-05-29 21:48:59 -0400
commite7b86a0d88760275afefa0c44a3c30602f80aac0 (patch)
tree30af911732ba01c96dd2cfe5c4ededa9abbb25ea /gnu/system.scm
parentc08fac0f7d175b9deb182c597cecdae997efce9d (diff)
downloadguix-e7b86a0d88760275afefa0c44a3c30602f80aac0.tar.gz
bootloader: grub: Rename the btrfs-subvolume-file-name parameter.
Following discussion in <https://issues.guix.gnu.org/37305>, it seems more
appropriate to give the parameter a more generic name that better describes
what it does.

* gnu/bootloader/grub.scm (normalize-file): Rename the
BTRFS-SUBVOLUME-FILE-NAME parameter to STORE-DIRECTORY-PREFIX, and always
assume this argument to be a string.
(eye-candy): Likewise.  Default STORE-DIRECTORY-PREFIX to "".
(grub-configuration-file): Likewise.
* gnu/system.scm (operating-system-bootcfg): Adapt.
Diffstat (limited to 'gnu/system.scm')
-rw-r--r--gnu/system.scm2
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index d929187695..ac8bbd1d16 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1118,7 +1118,7 @@ a list of <menu-entry>, to populate the \"old entries\" menu."
 
     (generate-config-file bootloader-conf (list entry)
                           #:old-entries old-entries
-                          #:btrfs-subvolume-file-name
+                          #:store-directory-prefix
 			  (btrfs-store-subvolume-file-name file-systems))))
 
 (define* (operating-system-boot-parameters os root-device