[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/10: bootloader: grub: Use inheritance to define grub-minimal-bootload
From: |
guix-commits |
Subject: |
03/10: bootloader: grub: Use inheritance to define grub-minimal-bootloader. |
Date: |
Sat, 23 May 2020 13:37:21 -0400 (EDT) |
mothacehe pushed a commit to branch wip-hurd-vm
in repository guix.
commit fc29bf120fc2bdd4d4eafc59ff0c0995e65fbbae
Author: Mathieu Othacehe <address@hidden>
AuthorDate: Sat May 23 19:09:46 2020 +0200
bootloader: grub: Use inheritance to define grub-minimal-bootloader.
* gnu/bootloader/grub.scm (grub-minimal-bootloader): Inherit from
grub-bootloader to avoid field redefinition.
---
gnu/bootloader/grub.scm | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index 033a84f..8cf374b 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -562,13 +562,10 @@ fi~%"))))
(configuration-file "/boot/grub/grub.cfg")
(configuration-file-generator grub-configuration-file)))
-(define grub-minimal-bootloader
+(define* grub-minimal-bootloader
(bootloader
- (name 'grub)
- (package grub-minimal)
- (installer install-grub)
- (configuration-file "/boot/grub/grub.cfg")
- (configuration-file-generator grub-configuration-file)))
+ (inherit grub-bootloader)
+ (package grub-minimal)))
(define* grub-efi-bootloader
(bootloader
- branch wip-hurd-vm updated (cd57c13 -> 7c919d1), guix-commits, 2020/05/23
- 04/10: image: Add bootloader installation support., guix-commits, 2020/05/23
- 01/10: bootloader: Add 'disk-image-installer'., guix-commits, 2020/05/23
- 02/10: bootloader: grub: Do not run grub-install when creating a disk-image., guix-commits, 2020/05/23
- 03/10: bootloader: grub: Use inheritance to define grub-minimal-bootloader.,
guix-commits <=
- 05/10: system: image: Correct genimage configuration file indentation., guix-commits, 2020/05/23
- 09/10: !squash system: Fix initrd field., guix-commits, 2020/05/23
- 06/10: image: Use grub-efi to install the EFI bootloader., guix-commits, 2020/05/23
- 07/10: system: image: Fix image-with-os., guix-commits, 2020/05/23
- 10/10: image: Add Hurd support., guix-commits, 2020/05/23
- 08/10: image: Do not use VM to create disk-images., guix-commits, 2020/05/23