From unknown Tue Aug 19 05:13:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#41746: [PATCH] gnu: grub: Support graphical gfxterm on all systems. Resent-From: Stefan Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 07 Jun 2020 12:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41746 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: 41746@debbugs.gnu.org Cc: Danny Milosavljevic X-Debbugs-Original-To: bug-guix@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15915321177985 (code B ref -1); Sun, 07 Jun 2020 12:16:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Jun 2020 12:15:17 +0000 Received: from localhost ([127.0.0.1]:53446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhuCq-00024j-Pz for submit@debbugs.gnu.org; Sun, 07 Jun 2020 08:15:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:33952) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhuCo-00024Z-JJ for submit@debbugs.gnu.org; Sun, 07 Jun 2020 08:15:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhuCm-0003VR-Mj for bug-guix@gnu.org; Sun, 07 Jun 2020 08:15:13 -0400 Received: from mx009.vodafonemail.xion.oxcs.net ([153.92.174.39]:41546) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhuCk-000714-Kh for bug-guix@gnu.org; Sun, 07 Jun 2020 08:15:11 -0400 Received: from vsmx002.vodafonemail.xion.oxcs.net (unknown [192.168.75.192]) by mta-6-out.mta.xion.oxcs.net (Postfix) with ESMTP id C2F206057CB; Sun, 7 Jun 2020 12:15:04 +0000 (UTC) Received: from macbook-pro.kuh-wiese.my-router.de (unknown [145.254.41.70]) by mta-6-out.mta.xion.oxcs.net (Postfix) with ESMTPA id 60391605950; Sun, 7 Jun 2020 12:15:00 +0000 (UTC) From: Stefan Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Date: Sun, 7 Jun 2020 14:14:59 +0200 Message-Id: <62F29C87-CB4C-404B-AC39-562FBFB2350E@vodafonemail.de> Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) X-Mailer: Apple Mail (2.3124) X-VADE-STATUS: LEGIT Received-SPF: pass client-ip=153.92.174.39; envelope-from=stefan-guix@vodafonemail.de; helo=mx009.vodafonemail.xion.oxcs.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/07 08:15:05 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x (no timestamps) [generic] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/bootloaders/grub.scm (eye-candy): Use gfxterm depending only on (bootloader-configuration (terminal-outputs =E2=80=A6)), which defaults = to '(gfxterm). This makes the system argument obsolete. --- gnu/bootloader/grub.scm | 46 ++++++++++++----------------------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 2d9a39afc3..544847b9cd 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -135,41 +135,25 @@ file with the resolution provided in CONFIG." (_ #f))))) =20 (define* (eye-candy config store-device store-mount-point - #:key store-directory-prefix system port) + #:key store-directory-prefix port) "Return a gexp that writes to PORT (a port-valued gexp) the = 'grub.cfg' part concerned with graphics mode, background images, colors, and all that. STORE-DEVICE designates the device holding the store, and = STORE-MOUNT-POINT is its mount point; these are used to determine where the background image = and -fonts must be searched for. SYSTEM must be the target system = string---e.g., -\"x86_64-linux\". STORE-DIRECTORY-PREFIX is a directory prefix to = prepend to -any store file name." - (define setup-gfxterm-body - (let ((gfxmode - (or (and-let* ((theme (bootloader-configuration-theme = config)) - (gfxmode (grub-theme-gfxmode theme))) - (string-join gfxmode ";")) - "auto"))) - - ;; Intel and EFI systems need to be switched into graphics mode, = whereas - ;; most other modern architectures have no other mode and = therefore - ;; don't need to be switched. - - ;; XXX: Do we really need to restrict to x86 systems? We could = imitate - ;; what the GRUB default configuration does and decide based on = whether - ;; a user provided 'gfxterm' in the terminal-outputs field of = their - ;; bootloader-configuration record. - (if (string-match "^(x86_64|i[3-6]86)-" system) - (format #f " - set gfxmode=3D~a - insmod all_video - insmod gfxterm~%" gfxmode) - ""))) - +fonts must be searched for. STORE-DIRECTORY-PREFIX is a directory = prefix to +prepend to any store file name." (define (setup-gfxterm config font-file) (if (memq 'gfxterm (bootloader-configuration-terminal-outputs = config)) - #~(format #f "if loadfont ~a; then - setup_gfxterm -fi~%" #+font-file) + #~(format #f " +if loadfont ~a; then + set gfxmode=3D~a + insmod all_video + insmod gfxterm +fi~%" + #$font-file + #$(string-join + (grub-theme-gfxmode (bootloader-theme config)) + ";")) "")) =20 (define (theme-colors type) @@ -190,8 +174,6 @@ fi~%" #+font-file) =20 (and image #~(format #$port " -function setup_gfxterm {~a} - # Set 'root' to the partition that contains /gnu/store. ~a =20 @@ -206,7 +188,6 @@ else set menu_color_normal=3Dcyan/blue set menu_color_highlight=3Dwhite/blue fi~%" - #$setup-gfxterm-body #$(grub-root-search store-device font-file) #$(setup-gfxterm config font-file) #$(grub-setup-io config) @@ -358,7 +339,6 @@ when booting a root file system on a Btrfs = subvolume." (menu-entry-device (first all-entries)) (menu-entry-device-mount-point (first all-entries)) #:store-directory-prefix store-directory-prefix - #:system system #:port #~port)) =20 (define keyboard-layout-config --=20 2.26.0 From unknown Tue Aug 19 05:13:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#41746: [PATCH] gnu: grub: Support graphical gfxterm on all systems. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 09 Jun 2020 09:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41746 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: Stefan Cc: 41746@debbugs.gnu.org Received: via spool by 41746-submit@debbugs.gnu.org id=B41746.15916939451197 (code B ref 41746); Tue, 09 Jun 2020 09:13:02 +0000 Received: (at 41746) by debbugs.gnu.org; 9 Jun 2020 09:12:25 +0000 Received: from localhost ([127.0.0.1]:58932 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jiaIy-0000JF-OF for submit@debbugs.gnu.org; Tue, 09 Jun 2020 05:12:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jiaIw-0000J2-Ix for 41746@debbugs.gnu.org; Tue, 09 Jun 2020 05:12:23 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:37693) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jiaIp-0007Nu-Eb; Tue, 09 Jun 2020 05:12:15 -0400 Received: from [2a01:e0a:fa:a50:d939:1174:2a3f:75c2] (port=49506 helo=meru) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jiaIo-0002Yp-I7; Tue, 09 Jun 2020 05:12:15 -0400 From: Mathieu Othacehe References: <62F29C87-CB4C-404B-AC39-562FBFB2350E@vodafonemail.de> Date: Tue, 09 Jun 2020 11:12:13 +0200 In-Reply-To: <62F29C87-CB4C-404B-AC39-562FBFB2350E@vodafonemail.de> (Stefan's message of "Sun, 7 Jun 2020 14:14:59 +0200") Message-ID: <874krkppqq.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hey Stefan, > * gnu/bootloaders/grub.scm (eye-candy): Use gfxterm depending only on > (bootloader-configuration (terminal-outputs =E2=80=A6)), which defaults t= o '(gfxterm). > This makes the system argument obsolete. This looks good, however due to recent changes in this file (multiboot support), it doesn't apply well. Could you please rebase it and send and updated version? Thanks, Mathieu From unknown Tue Aug 19 05:13:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#41746: [PATCH] gnu: grub: Support graphical gfxterm on all systems. Resent-From: Stefan Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 09 Jun 2020 12:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41746 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: 41746@debbugs.gnu.org Received: via spool by 41746-submit@debbugs.gnu.org id=B41746.159170503227041 (code B ref 41746); Tue, 09 Jun 2020 12:18:02 +0000 Received: (at 41746) by debbugs.gnu.org; 9 Jun 2020 12:17:12 +0000 Received: from localhost ([127.0.0.1]:59199 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jidBo-000725-3K for submit@debbugs.gnu.org; Tue, 09 Jun 2020 08:17:12 -0400 Received: from vsmx011.vodafonemail.xion.oxcs.net ([153.92.174.89]:20525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jidBm-00071r-K1 for 41746@debbugs.gnu.org; Tue, 09 Jun 2020 08:17:11 -0400 Received: from vsmx003.vodafonemail.xion.oxcs.net (unknown [192.168.75.197]) by mta-5-out.mta.xion.oxcs.net (Postfix) with ESMTP id 4679B59D113; Tue, 9 Jun 2020 12:17:04 +0000 (UTC) Received: from macbook-pro.kuh-wiese.my-router.de (unknown [2.206.141.235]) by mta-7-out.mta.xion.oxcs.net (Postfix) with ESMTPA id DA0E6539A88; Tue, 9 Jun 2020 12:16:58 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) From: Stefan In-Reply-To: <874krkppqq.fsf@gnu.org> Date: Tue, 9 Jun 2020 14:16:59 +0200 Content-Transfer-Encoding: quoted-printable Message-Id: <3769C832-C378-4C83-A9C2-A2DE19D97F13@vodafonemail.de> References: <62F29C87-CB4C-404B-AC39-562FBFB2350E@vodafonemail.de> <874krkppqq.fsf@gnu.org> X-Mailer: Apple Mail (2.3124) X-VADE-STATUS: LEGIT X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/bootloaders/grub.scm (eye-candy): Use gfxterm depending only on (bootloader-configuration (terminal-outputs =E2=80=A6)), which defaults = to '(gfxterm). This makes the system argument obsolete. --- gnu/bootloader/grub.scm | 46 ++++++++++++----------------------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index d4dbb57131..e3b8416d6d 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -135,41 +135,25 @@ file with the resolution provided in CONFIG." (_ #f))))) =20 (define* (eye-candy config store-device store-mount-point - #:key store-directory-prefix system port) + #:key store-directory-prefix port) "Return a gexp that writes to PORT (a port-valued gexp) the = 'grub.cfg' part concerned with graphics mode, background images, colors, and all that. STORE-DEVICE designates the device holding the store, and = STORE-MOUNT-POINT is its mount point; these are used to determine where the background image = and -fonts must be searched for. SYSTEM must be the target system = string---e.g., -\"x86_64-linux\". STORE-DIRECTORY-PREFIX is a directory prefix to = prepend to -any store file name." - (define setup-gfxterm-body - (let ((gfxmode - (or (and-let* ((theme (bootloader-configuration-theme = config)) - (gfxmode (grub-theme-gfxmode theme))) - (string-join gfxmode ";")) - "auto"))) - - ;; Intel and EFI systems need to be switched into graphics mode, = whereas - ;; most other modern architectures have no other mode and = therefore - ;; don't need to be switched. - - ;; XXX: Do we really need to restrict to x86 systems? We could = imitate - ;; what the GRUB default configuration does and decide based on = whether - ;; a user provided 'gfxterm' in the terminal-outputs field of = their - ;; bootloader-configuration record. - (if (string-match "^(x86_64|i[3-6]86)-" system) - (format #f " - set gfxmode=3D~a - insmod all_video - insmod gfxterm~%" gfxmode) - ""))) - +fonts must be searched for. STORE-DIRECTORY-PREFIX is a directory = prefix to +prepend to any store file name." (define (setup-gfxterm config font-file) (if (memq 'gfxterm (bootloader-configuration-terminal-outputs = config)) - #~(format #f "if loadfont ~a; then - setup_gfxterm -fi~%" #+font-file) + #~(format #f " +if loadfont ~a; then + set gfxmode=3D~a + insmod all_video + insmod gfxterm +fi~%" + #$font-file + #$(string-join + (grub-theme-gfxmode (bootloader-theme config)) + ";")) "")) =20 (define (theme-colors type) @@ -190,8 +174,6 @@ fi~%" #+font-file) =20 (and image #~(format #$port " -function setup_gfxterm {~a} - # Set 'root' to the partition that contains /gnu/store. ~a =20 @@ -206,7 +188,6 @@ else set menu_color_normal=3Dcyan/blue set menu_color_highlight=3Dwhite/blue fi~%" - #$setup-gfxterm-body #$(grub-root-search store-device font-file) #$(setup-gfxterm config font-file) #$(grub-setup-io config) @@ -380,7 +361,6 @@ menuentry ~s { device mount-point #:store-directory-prefix store-directory-prefix - #:system system #:port #~port))) =20 (define keyboard-layout-config --=20 2.26.0 From unknown Tue Aug 19 05:13:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#41746: [PATCH] gnu: grub: Support graphical gfxterm on all systems. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 09 Jun 2020 12:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41746 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: Stefan Cc: 41746@debbugs.gnu.org Received: via spool by 41746-submit@debbugs.gnu.org id=B41746.159170550628150 (code B ref 41746); Tue, 09 Jun 2020 12:26:01 +0000 Received: (at 41746) by debbugs.gnu.org; 9 Jun 2020 12:25:06 +0000 Received: from localhost ([127.0.0.1]:59207 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jidJS-0007Jw-7W for submit@debbugs.gnu.org; Tue, 09 Jun 2020 08:25:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jidJQ-0007JI-2K for 41746@debbugs.gnu.org; Tue, 09 Jun 2020 08:25:04 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40238) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jidJI-0005Xc-PN; Tue, 09 Jun 2020 08:24:56 -0400 Received: from [2a01:e0a:fa:a50:d939:1174:2a3f:75c2] (port=51986 helo=meru) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jidJI-0002K1-AI; Tue, 09 Jun 2020 08:24:56 -0400 From: Mathieu Othacehe References: <62F29C87-CB4C-404B-AC39-562FBFB2350E@vodafonemail.de> <874krkppqq.fsf@gnu.org> <3769C832-C378-4C83-A9C2-A2DE19D97F13@vodafonemail.de> Date: Tue, 09 Jun 2020 14:24:53 +0200 In-Reply-To: <3769C832-C378-4C83-A9C2-A2DE19D97F13@vodafonemail.de> (Stefan's message of "Tue, 9 Jun 2020 14:16:59 +0200") Message-ID: <87mu5co296.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Thanks for rebasing :) Your copyright is missing, is this ok for you if I use: "Stefan " or would you prefer something else? Mathieu From unknown Tue Aug 19 05:13:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#41746: [PATCH] gnu: grub: Support graphical gfxterm on all systems. Resent-From: Stefan Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 09 Jun 2020 12:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41746 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: 41746@debbugs.gnu.org Received: via spool by 41746-submit@debbugs.gnu.org id=B41746.159170557728263 (code B ref 41746); Tue, 09 Jun 2020 12:27:01 +0000 Received: (at 41746) by debbugs.gnu.org; 9 Jun 2020 12:26:17 +0000 Received: from localhost ([127.0.0.1]:59212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jidKa-0007Ln-O4 for submit@debbugs.gnu.org; Tue, 09 Jun 2020 08:26:16 -0400 Received: from vsmx009.vodafonemail.xion.oxcs.net ([153.92.174.87]:31592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jidKZ-0007Lb-SF for 41746@debbugs.gnu.org; Tue, 09 Jun 2020 08:26:16 -0400 Received: from vsmx001.vodafonemail.xion.oxcs.net (unknown [192.168.75.191]) by mta-5-out.mta.xion.oxcs.net (Postfix) with ESMTP id F2636159D211; Tue, 9 Jun 2020 12:26:09 +0000 (UTC) Received: from macbook-pro.kuh-wiese.my-router.de (unknown [2.206.141.235]) by mta-5-out.mta.xion.oxcs.net (Postfix) with ESMTPA id 9DFD8159BE3D; Tue, 9 Jun 2020 12:26:05 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) From: Stefan In-Reply-To: <87mu5co296.fsf@gnu.org> Date: Tue, 9 Jun 2020 14:26:05 +0200 Content-Transfer-Encoding: quoted-printable Message-Id: <47E5D4EC-E3BA-4855-ACD7-D408D0E8D10A@vodafonemail.de> References: <62F29C87-CB4C-404B-AC39-562FBFB2350E@vodafonemail.de> <874krkppqq.fsf@gnu.org> <3769C832-C378-4C83-A9C2-A2DE19D97F13@vodafonemail.de> <87mu5co296.fsf@gnu.org> X-Mailer: Apple Mail (2.3124) X-VADE-STATUS: LEGIT X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Welcome. Yes, that=E2=80=99s fine. > Am 09.06.2020 um 14:24 schrieb Mathieu Othacehe : >=20 >=20 > Thanks for rebasing :) >=20 > Your copyright is missing, is this ok for you if I use: >=20 > "Stefan " >=20 > or would you prefer something else? >=20 > Mathieu From unknown Tue Aug 19 05:13:14 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Stefan Subject: bug#41746: closed (Re: bug#41746: [PATCH] gnu: grub: Support graphical gfxterm on all systems.) Message-ID: References: <87ftb4nu57.fsf@gnu.org> <62F29C87-CB4C-404B-AC39-562FBFB2350E@vodafonemail.de> X-Gnu-PR-Message: they-closed 41746 X-Gnu-PR-Package: guix X-Gnu-PR-Keywords: patch Reply-To: 41746@debbugs.gnu.org Date: Tue, 09 Jun 2020 15:21:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1591716062-14177-1" This is a multi-part message in MIME format... ------------=_1591716062-14177-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #41746: [PATCH] gnu: grub: Support graphical gfxterm on all systems. which was filed against the guix package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 41746@debbugs.gnu.org. --=20 41746: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D41746 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1591716062-14177-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 41746-done) by debbugs.gnu.org; 9 Jun 2020 15:20:17 +0000 Received: from localhost ([127.0.0.1]:60599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jig2y-0003fY-R2 for submit@debbugs.gnu.org; Tue, 09 Jun 2020 11:20:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jig2x-0003fL-KX for 41746-done@debbugs.gnu.org; Tue, 09 Jun 2020 11:20:16 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:43560) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jig2p-0003Zz-G6; Tue, 09 Jun 2020 11:20:07 -0400 Received: from [2a01:e0a:fa:a50:d939:1174:2a3f:75c2] (port=52634 helo=meru) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jig2n-00040G-E1; Tue, 09 Jun 2020 11:20:06 -0400 From: Mathieu Othacehe To: Stefan Subject: Re: bug#41746: [PATCH] gnu: grub: Support graphical gfxterm on all systems. References: <62F29C87-CB4C-404B-AC39-562FBFB2350E@vodafonemail.de> <874krkppqq.fsf@gnu.org> <3769C832-C378-4C83-A9C2-A2DE19D97F13@vodafonemail.de> <87mu5co296.fsf@gnu.org> <47E5D4EC-E3BA-4855-ACD7-D408D0E8D10A@vodafonemail.de> Date: Tue, 09 Jun 2020 17:20:04 +0200 In-Reply-To: <47E5D4EC-E3BA-4855-ACD7-D408D0E8D10A@vodafonemail.de> (Stefan's message of "Tue, 9 Jun 2020 14:26:05 +0200") Message-ID: <87ftb4nu57.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 41746-done Cc: 41746-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Welcome. Yes, that=E2=80=99s fine. I fixed indentation, added your copyright and pushed! Thanks, Mathieu ------------=_1591716062-14177-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 7 Jun 2020 12:15:17 +0000 Received: from localhost ([127.0.0.1]:53446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhuCq-00024j-Pz for submit@debbugs.gnu.org; Sun, 07 Jun 2020 08:15:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:33952) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhuCo-00024Z-JJ for submit@debbugs.gnu.org; Sun, 07 Jun 2020 08:15:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhuCm-0003VR-Mj for bug-guix@gnu.org; Sun, 07 Jun 2020 08:15:13 -0400 Received: from mx009.vodafonemail.xion.oxcs.net ([153.92.174.39]:41546) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhuCk-000714-Kh for bug-guix@gnu.org; Sun, 07 Jun 2020 08:15:11 -0400 Received: from vsmx002.vodafonemail.xion.oxcs.net (unknown [192.168.75.192]) by mta-6-out.mta.xion.oxcs.net (Postfix) with ESMTP id C2F206057CB; Sun, 7 Jun 2020 12:15:04 +0000 (UTC) Received: from macbook-pro.kuh-wiese.my-router.de (unknown [145.254.41.70]) by mta-6-out.mta.xion.oxcs.net (Postfix) with ESMTPA id 60391605950; Sun, 7 Jun 2020 12:15:00 +0000 (UTC) From: Stefan Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: [PATCH] gnu: grub: Support graphical gfxterm on all systems. Date: Sun, 7 Jun 2020 14:14:59 +0200 Message-Id: <62F29C87-CB4C-404B-AC39-562FBFB2350E@vodafonemail.de> To: bug-guix@gnu.org Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) X-Mailer: Apple Mail (2.3124) X-VADE-STATUS: LEGIT Received-SPF: pass client-ip=153.92.174.39; envelope-from=stefan-guix@vodafonemail.de; helo=mx009.vodafonemail.xion.oxcs.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/07 08:15:05 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x (no timestamps) [generic] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/bootloaders/grub.scm (eye-candy): Use gfxterm depending only on (bootloader-configuration (terminal-outputs =E2=80=A6)), which defaults = to '(gfxterm). This makes the system argument obsolete. --- gnu/bootloader/grub.scm | 46 ++++++++++++----------------------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 2d9a39afc3..544847b9cd 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -135,41 +135,25 @@ file with the resolution provided in CONFIG." (_ #f))))) =20 (define* (eye-candy config store-device store-mount-point - #:key store-directory-prefix system port) + #:key store-directory-prefix port) "Return a gexp that writes to PORT (a port-valued gexp) the = 'grub.cfg' part concerned with graphics mode, background images, colors, and all that. STORE-DEVICE designates the device holding the store, and = STORE-MOUNT-POINT is its mount point; these are used to determine where the background image = and -fonts must be searched for. SYSTEM must be the target system = string---e.g., -\"x86_64-linux\". STORE-DIRECTORY-PREFIX is a directory prefix to = prepend to -any store file name." - (define setup-gfxterm-body - (let ((gfxmode - (or (and-let* ((theme (bootloader-configuration-theme = config)) - (gfxmode (grub-theme-gfxmode theme))) - (string-join gfxmode ";")) - "auto"))) - - ;; Intel and EFI systems need to be switched into graphics mode, = whereas - ;; most other modern architectures have no other mode and = therefore - ;; don't need to be switched. - - ;; XXX: Do we really need to restrict to x86 systems? We could = imitate - ;; what the GRUB default configuration does and decide based on = whether - ;; a user provided 'gfxterm' in the terminal-outputs field of = their - ;; bootloader-configuration record. - (if (string-match "^(x86_64|i[3-6]86)-" system) - (format #f " - set gfxmode=3D~a - insmod all_video - insmod gfxterm~%" gfxmode) - ""))) - +fonts must be searched for. STORE-DIRECTORY-PREFIX is a directory = prefix to +prepend to any store file name." (define (setup-gfxterm config font-file) (if (memq 'gfxterm (bootloader-configuration-terminal-outputs = config)) - #~(format #f "if loadfont ~a; then - setup_gfxterm -fi~%" #+font-file) + #~(format #f " +if loadfont ~a; then + set gfxmode=3D~a + insmod all_video + insmod gfxterm +fi~%" + #$font-file + #$(string-join + (grub-theme-gfxmode (bootloader-theme config)) + ";")) "")) =20 (define (theme-colors type) @@ -190,8 +174,6 @@ fi~%" #+font-file) =20 (and image #~(format #$port " -function setup_gfxterm {~a} - # Set 'root' to the partition that contains /gnu/store. ~a =20 @@ -206,7 +188,6 @@ else set menu_color_normal=3Dcyan/blue set menu_color_highlight=3Dwhite/blue fi~%" - #$setup-gfxterm-body #$(grub-root-search store-device font-file) #$(setup-gfxterm config font-file) #$(grub-setup-io config) @@ -358,7 +339,6 @@ when booting a root file system on a Btrfs = subvolume." (menu-entry-device (first all-entries)) (menu-entry-device-mount-point (first all-entries)) #:store-directory-prefix store-directory-prefix - #:system system #:port #~port)) =20 (define keyboard-layout-config --=20 2.26.0 ------------=_1591716062-14177-1--