guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#26334: [PATCH 1/1] system: grub: Enable the use of a non-graphical G


From: Leo Famulari
Subject: bug#26334: [PATCH 1/1] system: grub: Enable the use of a non-graphical GRUB menu.
Date: Sat, 1 Apr 2017 16:22:32 -0400

* gnu/system/grub.scm (<grub-configuration>)[graphical?]: New field.
(eye-candy)[setup-gfxterm-body]: Use 'graphical?'.
* doc/guix.texi (GRUB Configuration): Document 'graphical?'.
---
 doc/guix.texi       |  4 ++++
 gnu/system/grub.scm | 14 +++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 8da82b4d8..75fc76396 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -14915,6 +14915,10 @@ The @code{grub-theme} object describing the theme to 
use.
 
 @item @code{grub} (default: @code{grub})
 The GRUB package to use.
+
address@hidden @code{graphical?} (default: @code{#t})
+A Boolean field that controls whether the GRUB boot menu is graphical or
+text-based.
 @end table
 
 @end deftp
diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm
index 4f9bde6a6..ad1bc8768 100644
--- a/gnu/system/grub.scm
+++ b/gnu/system/grub.scm
@@ -117,7 +117,9 @@ denoting a file name."
   (timeout         grub-configuration-timeout        ; integer
                    (default 5))
   (theme           grub-configuration-theme          ; <grub-theme>
-                   (default %default-theme)))
+                   (default %default-theme))
+  (graphical?      grub-configuration-graphical?     ; boolean
+                   (default #t)))
 
 (define-record-type* <menu-entry>
   menu-entry make-menu-entry
@@ -181,6 +183,7 @@ system string---e.g., \"x86_64-linux\"."
     ;; most other modern architectures have no other mode and therefore don't
     ;; need to be switched.
     (if (string-match "^(x86_64|i[3-6]86)-" system)
+      (string-append
         "
   # Leave 'gfxmode' to 'auto'.
   insmod video_bochs
@@ -198,10 +201,15 @@ system string---e.g., \"x86_64-linux\"."
     insmod vbe
     insmod vga
   fi
-
+"
+        (if (grub-configuration-graphical? config)
+          "
   terminal_output gfxterm
 "
-        ""))
+          "
+  terminal_output console
+")
+        "")))
 
   (define (theme-colors type)
     (let* ((theme  (grub-configuration-theme config))
-- 
2.12.2






reply via email to

[Prev in Thread] Current Thread [Next in Thread]