[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/35: bootloader: grub: Use inheritance to define grub-minimal-bootload
|
From: |
guix-commits |
|
Subject: |
11/35: bootloader: grub: Use inheritance to define grub-minimal-bootloader. |
|
Date: |
Thu, 28 May 2020 13:03:30 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit d04291b0d89676529667d4fdbe06980476a30925
Author: Mathieu Othacehe <othacehe@gnu.org>
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 29bec92..388f29d 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -516,13 +516,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
- 29/35: services: hurd: Use activation-service, hurd-etc-service., (continued)
- 29/35: services: hurd: Use activation-service, hurd-etc-service., guix-commits, 2020/05/28
- 31/35: services: Add `hurd-console-service-type'., guix-commits, 2020/05/28
- 32/35: services: Add `hurd-getty-service-type'., guix-commits, 2020/05/28
- 04/35: vm: 'qemu-image' preserves the cross-compilation target of the OS., guix-commits, 2020/05/28
- 10/35: bootloader: grub: Do not run grub-install when creating a disk-image., guix-commits, 2020/05/28
- 12/35: image: Add bootloader installation support., guix-commits, 2020/05/28
- 19/35: image: Support extra-directives, add hurd-directives., guix-commits, 2020/05/28
- 20/35: system: hurd: Add hurd-default-essential-services., guix-commits, 2020/05/28
- 22/35: bootloader: Extend `<menu-entry>' for multiboot., guix-commits, 2020/05/28
- 27/35: services: hurd: Add `hurd-etc-service'., guix-commits, 2020/05/28
- 11/35: bootloader: grub: Use inheritance to define grub-minimal-bootloader.,
guix-commits <=
- 24/35: bootloader: grub: Add support for multiboot., guix-commits, 2020/05/28
- 28/35: system: Add `hurd-activation'., guix-commits, 2020/05/28
- 30/35: gnu: hurd: Create minimal "runsystem" script to invoke "rc"., guix-commits, 2020/05/28
- 33/35: system: hurd: Populate services., guix-commits, 2020/05/28
- 34/35: system: hurd: Remove 'cross-hurd-image' hack., guix-commits, 2020/05/28
- 35/35: system: bare-hurd.tmpl: Add openssh client and service., guix-commits, 2020/05/28