diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-14 16:30:19 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-14 16:30:19 +0100 |
| commit | 19008a22d18e772062952034c58a15ed341df3b5 (patch) | |
| tree | 3a7fb9b4abe5cbac3f7edd5d5c76abd993fad255 /gnu/bootloader | |
| parent | 520ae432d446010ed6a5233c8abfda88a945926c (diff) | |
| parent | c958c31caefb20c32cf89caea7d4668d7021a92b (diff) | |
| download | guix-19008a22d18e772062952034c58a15ed341df3b5.tar guix-19008a22d18e772062952034c58a15ed341df3b5.tar.gz | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/bootloader')
| -rw-r--r-- | gnu/bootloader/extlinux.scm | 4 | ||||
| -rw-r--r-- | gnu/bootloader/grub.scm | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gnu/bootloader/extlinux.scm b/gnu/bootloader/extlinux.scm index b48596c496..2bb711eed1 100644 --- a/gnu/bootloader/extlinux.scm +++ b/gnu/bootloader/extlinux.scm @@ -57,10 +57,10 @@ corresponding to old generations of the system." #~(call-with-output-file #$output (lambda (port) (let ((timeout #$(bootloader-configuration-timeout config))) - (format port "# This file was generated from your GuixSD configuration. Any changes + (format port "# This file was generated from your Guix configuration. Any changes # will be lost upon reconfiguration. UI menu.c32 -MENU TITLE GuixSD Boot Options +MENU TITLE GNU Guix Boot Options PROMPT ~a TIMEOUT ~a~%" (if (> timeout 0) 1 0) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 161e8b3d02..51d5787364 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> @@ -334,7 +334,7 @@ entries corresponding to old generations of the system." #~(call-with-output-file #$output (lambda (port) (format port - "# This file was generated from your GuixSD configuration. Any changes + "# This file was generated from your Guix configuration. Any changes # will be lost upon reconfiguration. ") #$sugar @@ -380,7 +380,7 @@ submenu \"GNU system, old configurations...\" {~%") ;; system whose root is mounted at MOUNT-POINT. (let ((grub-install (string-append bootloader "/sbin/grub-install")) (install-dir (string-append mount-point "/boot")) - ;; When installing GuixSD, it's common to mount EFI-DIR below + ;; When installing Guix, it's common to mount EFI-DIR below ;; MOUNT-POINT rather than /boot/efi on the live image. (target-esp (if (file-exists? (string-append mount-point efi-dir)) (string-append mount-point efi-dir) @@ -389,7 +389,7 @@ submenu \"GNU system, old configurations...\" {~%") ;; root partition. (setenv "GRUB_ENABLE_CRYPTODISK" "y") (unless (zero? (system* grub-install "--boot-directory" install-dir - "--bootloader-id=GuixSD" + "--bootloader-id=Guix" "--efi-directory" target-esp)) (error "failed to install GRUB (EFI)"))))) |