From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuPYB-0003Pw-P4 for guix-patches@gnu.org; Sat, 01 Apr 2017 16:23:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cuPY6-0003Dg-Sc for guix-patches@gnu.org; Sat, 01 Apr 2017 16:23:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:57782) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cuPY6-0003D1-PP for guix-patches@gnu.org; Sat, 01 Apr 2017 16:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cuPY6-0000dS-IA for guix-patches@gnu.org; Sat, 01 Apr 2017 16:23:02 -0400 Subject: bug#26334: [PATCH 1/1] system: grub: Enable the use of a non-graphical GRUB menu. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuPXr-0003MJ-0e for guix-patches@gnu.org; Sat, 01 Apr 2017 16:22:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cuPXm-0002Tl-52 for guix-patches@gnu.org; Sat, 01 Apr 2017 16:22:47 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:52266) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cuPXl-0002Rr-S3 for guix-patches@gnu.org; Sat, 01 Apr 2017 16:22:42 -0400 Received: from localhost.localdomain (c-73-165-108-70.hsd1.pa.comcast.net [73.165.108.70]) by mail.messagingengine.com (Postfix) with ESMTPA id D55127E350 for ; Sat, 1 Apr 2017 16:22:40 -0400 (EDT) From: Leo Famulari Date: Sat, 1 Apr 2017 16:22:32 -0400 Message-Id: <9b295fdca9e25e89fa90e0000f3b6117bb96f398.1491078152.git.leo@famulari.name> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26334@debbugs.gnu.org * gnu/system/grub.scm ()[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. + +@item @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 ; - (default %default-theme))) + (default %default-theme)) + (graphical? grub-configuration-graphical? ; boolean + (default #t))) (define-record-type* 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