Package: guix-patches;
Reported by: Mathieu Othacehe <m.othacehe <at> gmail.com>
Date: Sun, 2 Apr 2017 13:51:01 UTC
Severity: important
Tags: patch
Done: Mathieu Othacehe <m.othacehe <at> gmail.com>
Bug is archived. No further changes may be made.
Message #182 received at 26339 <at> debbugs.gnu.org (full text, mbox):
From: Mathieu Othacehe <m.othacehe <at> gmail.com> To: 26339 <at> debbugs.gnu.org Cc: Mathieu Othacehe <m.othacehe <at> gmail.com> Subject: [PATCH v2 05/12] system: Add bootloader type. Date: Mon, 17 Apr 2017 11:01:41 +0200
* gnu/system/bootloader.scm
(<bootloader-configuration>)[type]: New field.
(%extlinux-configuration, %grub-configuration, %grub-efi-configuration,
%syslinux-configuration): New exported variables.
(extlinux-configuration, grub-configuration, grub-efi-configuration,
syslinux-configuration): New exported compatibility macros.
---
gnu/system/bootloader.scm | 119 ++++++++++++++++++++++++++++++++--------------
1 file changed, 83 insertions(+), 36 deletions(-)
diff --git a/gnu/system/bootloader.scm b/gnu/system/bootloader.scm
index fddf038b8..bab6cfab3 100644
--- a/gnu/system/bootloader.scm
+++ b/gnu/system/bootloader.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 David Craven <david <at> craven.ch>
+;;; Copyright © 2017 Mathieu Othacehe <m.othacehe <at> gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -22,10 +23,12 @@
#:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix records)
+ #:use-module (srfi srfi-1)
#:use-module (ice-9 match)
#:export (bootloader-configuration
bootloader-configuration?
bootloader-configuration-bootloader
+ bootloader-configuration-type
bootloader-configuration-device
bootloader-configuration-menu-entries
bootloader-configuration-default-entry
@@ -35,6 +38,13 @@
bootloader-configuration-installer
bootloader-configuration-additional-configuration
+ %extlinux-configuration
+ %grub-configuration
+ %grub-efi-configuration
+ %syslinux-configuration
+
+ lookup-bootloader-configuration
+
extlinux-configuration
grub-configuration
grub-efi-configuration
@@ -54,6 +64,8 @@
bootloader-configuration?
(bootloader bootloader-configuration-bootloader ; package
(default #f))
+ (type bootloader-configuration-type
+ (default #f)) ; symbol
(device bootloader-configuration-device ; string
(default #f))
(menu-entries bootloader-configuration-menu-entries ; list of <boot-parameters>
@@ -126,43 +138,7 @@ TIMEOUT ~a~%"
(gexp->derivation "extlinux.conf" builder))
-
-
-
-;;;
-;;; Bootloader configurations.
-;;;
-
-(define* (extlinux-configuration #:optional (config (bootloader-configuration)))
- (bootloader-configuration
- (inherit config)
- (configuration-file-name "/boot/extlinux/extlinux.conf")
- (configuration-file-generator extlinux-configuration-file)))
-
-(define* (grub-configuration #:optional (config (bootloader-configuration)))
- (bootloader-configuration
- (inherit config)
- (bootloader (@ (gnu packages bootloaders) grub))
- (configuration-file-name "/boot/grub/grub.cfg")
- (configuration-file-generator grub-configuration-file)
- (installer install-grub)
- (additional-configuration
- (let ((additional-config (bootloader-configuration-additional-configuration config)))
- (if additional-config additional-config %default-theme)))))
-
-(define* (grub-efi-configuration #:optional (config (bootloader-configuration)))
- (bootloader-configuration
- (inherit (grub-configuration config))
- (bootloader (@ (gnu packages bootloaders) grub-efi))))
-
-(define* (syslinux-configuration #:optional (config (bootloader-configuration)))
- (bootloader-configuration
- (inherit (extlinux-configuration config))
- (bootloader (@ (gnu packages bootloaders) syslinux))
- (installer install-syslinux)))
-
-
;;;
;;; Bootloader install procedures.
;;;
@@ -204,4 +180,75 @@ TIMEOUT ~a~%"
(#$dd 440 1 (string-append syslinux-dir "/mbr.bin") device))
(error "failed to install SYSLINUX")))))
+
+;;;
+;;; Bootloader configurations.
+;;;
+
+(define* %extlinux-configuration
+ (bootloader-configuration
+ (type 'extlinux)
+ (configuration-file-name "/boot/extlinux/extlinux.conf")
+ (configuration-file-generator extlinux-configuration-file)))
+
+(define* %grub-configuration
+ (bootloader-configuration
+ (type 'grub)
+ (bootloader (@ (gnu packages bootloaders) grub))
+ (configuration-file-name "/boot/grub/grub.cfg")
+ (configuration-file-generator grub-configuration-file)
+ (installer install-grub)
+ (additional-configuration %default-theme)))
+
+(define* %grub-efi-configuration
+ (bootloader-configuration
+ (inherit %grub-configuration)
+ (type 'grub-efi)
+ (bootloader (@ (gnu packages bootloaders) grub-efi))))
+
+(define* %syslinux-configuration
+ (bootloader-configuration
+ (inherit %extlinux-configuration)
+ (type 'syslinux)
+ (bootloader (@ (gnu packages bootloaders) syslinux))
+ (installer install-syslinux)))
+
+(define %bootloader-configurations
+ (list %extlinux-configuration
+ %grub-configuration
+ %grub-efi-configuration
+ %syslinux-configuration))
+
+(define (lookup-bootloader-configuration type)
+ (or (find (lambda (conf)
+ (eq? (bootloader-configuration-type conf)
+ type))
+ %bootloader-configurations)
+ (error "~a: unknown bootloader type" type)))
+
+
+;;;
+;;; Compatibility macros.
+;;;
+
+(define-syntax-rule (extlinux-configuration fields ...)
+ (bootloader-configuration
+ (inherit %extlinux-configuration)
+ fields ...))
+
+(define-syntax-rule (grub-configuration fields ...)
+ (bootloader-configuration
+ (inherit %grub-configuration)
+ fields ...))
+
+(define-syntax-rule (grub-efi-configuration fields ...)
+ (bootloader-configuration
+ (inherit %grub-efi-configuration)
+ fields ...))
+
+(define-syntax-rule (syslinux-configuration fields ...)
+ (bootloader-configuration
+ (inherit %syslinux-configuration)
+ fields ...))
+
;;; bootloader.scm ends here
--
2.12.2
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.