summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2017-06-12 22:38:22 +0300
committerAlex Kost <alezost@gmail.com>2017-06-12 22:38:22 +0300
commit901e148dc15383067204b0b882253d7c2fcb9cd7 (patch)
tree850ff036a8e49cb6e528c96a158fa0f761329106
parentelisp/ui-package: Support obsolete packages for size command (diff)
downloadguix-wigust-901e148dc15383067204b0b882253d7c2fcb9cd7.tar.gz
elisp/ui-system-generation: Rename bootloader parameter
Follow the changes introduced by <http://git.savannah.gnu.org/cgit/guix.git/commit/?id=f96752e378e924b44f75f642104956314d7d5fe5>. * scheme/emacs-guix/system-generations.scm (system-generation-param-alist): Rename 'boot-name' to 'bootloader'. * elisp/guix-ui-system-generation.el (guix-system-generation-info-format): Likewise. (guix-system-generation-info-titles): Remove "Bootloader" title.
-rw-r--r--elisp/guix-ui-system-generation.el5
-rw-r--r--scheme/emacs-guix/system-generations.scm2
2 files changed, 3 insertions, 4 deletions
diff --git a/elisp/guix-ui-system-generation.el b/elisp/guix-ui-system-generation.el
index 082c908..f8024ef 100644
--- a/elisp/guix-ui-system-generation.el
+++ b/elisp/guix-ui-system-generation.el
@@ -110,7 +110,7 @@ SEARCH-VALUES."
(number-of-packages format guix-generation-info-insert-packages)
(file-name simple guix-system-generation-info-insert-file-name)
(time format (time))
- (boot-name format (format))
+ (bootloader format (format))
(root-device format (format))
(store-device format (format))
(store-mount-point format (format bui-file))
@@ -118,8 +118,7 @@ SEARCH-VALUES."
(kernel-config simple (indent bui-file))
(shepherd-config simple
guix-system-generation-info-insert-shepherd))
- :titles (cons '(boot-name . "Bootloader")
- guix-generation-info-titles)
+ :titles guix-generation-info-titles
:required guix-generation-info-required-params)
(defun guix-system-generation-info-get-entries (profile search-type
diff --git a/scheme/emacs-guix/system-generations.scm b/scheme/emacs-guix/system-generations.scm
index d7db241..2148019 100644
--- a/scheme/emacs-guix/system-generations.scm
+++ b/scheme/emacs-guix/system-generations.scm
@@ -51,7 +51,7 @@ PROFILE."
(root-device . ,(accessor boot-parameters-root-device))
(store-device . ,(accessor boot-parameters-store-device))
(store-mount-point . ,(accessor boot-parameters-store-mount-point))
- (boot-name . ,(accessor boot-parameters-boot-name))
+ (bootloader . ,(accessor boot-parameters-bootloader-name))
(kernel . ,(accessor boot-parameters-kernel))
;; FIXME `read-boot-parameters-file' adds bootable-kernel-arguments