Package: guix-patches;
Reported by: Stefan <stefan-guix <at> vodafonemail.de>
Date: Fri, 1 May 2020 20:33:02 UTC
Severity: normal
Tags: patch
Done: Stefan <stefan-guix <at> vodafonemail.de>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: help-debbugs <at> gnu.org (GNU bug Tracking System) To: Stefan <stefan-guix <at> vodafonemail.de> Subject: bug#41011: closed ([bug#41011] [PATCH] gnu: grub: Support for network boot via TFTP.) Date: Sun, 27 Sep 2020 11:58:02 +0000
[Message part 1 (text/plain, inline)]
Your bug report #41011: [PATCH] gnu: grub: Support for network boot via tftp/nfs. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 41011 <at> debbugs.gnu.org. -- 41011: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=41011 GNU Bug Tracking System Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: Stefan <stefan-guix <at> vodafonemail.de> To: 41011-done <at> debbugs.gnu.org Subject: [bug#41011] [PATCH] gnu: grub: Support for network boot via TFTP. Date: Sun, 27 Sep 2020 13:57:49 +0200
[Message part 3 (message/rfc822, inline)]
From: Stefan <stefan-guix <at> vodafonemail.de> To: guix-patches <at> gnu.org Subject: [PATCH] gnu: grub: Support for network boot via tftp/nfs. Date: Fri, 1 May 2020 22:32:44 +0200* gnu/bootloader/grub.scm (grub-efi-net-bootloader): New efi bootloader for network booting via tftp/nfs and possibly images, prepared for chain loading. (install-grub-efi-net): New bootloader installer for tftp and possibly images, does not need root rights. (grub-root-search): Adding support for tftp root. (eye-candy): Enable gfxterm support for all systems. * gnu/system.scm (read-boot-parameters): Prevent devices with ":/" from being treated as a file system label. --- gnu/bootloader/grub.scm | 107 +++++++++++++++++++++++++++++++--------- gnu/system.scm | 3 +- 2 files changed, 86 insertions(+), 24 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 190b717163..9ca4f016f6 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -23,7 +23,7 @@ (define-module (gnu bootloader grub) #:use-module (guix records) - #:use-module ((guix utils) #:select (%current-system)) + #:use-module ((guix utils) #:select (%current-system %current-target-system)) #:use-module (guix gexp) #:use-module (gnu artwork) #:use-module (gnu bootloader) @@ -53,6 +53,7 @@ grub-bootloader grub-efi-bootloader + grub-efi-net-bootloader grub-mkrescue-bootloader grub-configuration)) @@ -142,34 +143,20 @@ WIDTH/HEIGHT, or #f if none was found." #:width width #:height height)))) (define* (eye-candy config store-device store-mount-point - #:key system port) + #:key 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\"." +background image and fonts must be searched for." (define setup-gfxterm-body - (let ((gfxmode - (or (and-let* ((theme (bootloader-configuration-theme config)) - (gfxmode (grub-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 " + (format #f " set gfxmode=~a insmod all_video - insmod gfxterm~%" gfxmode) - ""))) + insmod gfxterm~%" + (string-join + (grub-gfxmode (bootloader-theme config)) + ";"))) (define (setup-gfxterm config font-file) (if (memq 'gfxterm (bootloader-configuration-terminal-outputs config)) @@ -316,6 +303,9 @@ code." ((? file-system-label? label) (format #f "search --label --set ~a" (file-system-label->string label))) + ((? (lambda (device) + (and (string? device) (string-contains device ":/"))) nfs-uri) + "set root=(tftp)") ((or #f (? string?)) #~(format #f "search --file --set ~a" #$file))))) @@ -355,7 +345,6 @@ entries corresponding to old generations of the system." (eye-candy config (menu-entry-device (first all-entries)) (menu-entry-device-mount-point (first all-entries)) - #:system system #:port #~port)) (define keyboard-layout-config @@ -443,6 +432,68 @@ fi~%")))) "--bootloader-id=Guix" "--efi-directory" target-esp)))) +(define (install-grub-efi-net efi-subdir) + "Define a grub-efi bootloader installer for installation in EFI-SUBDIR, +which is usually \"efi/guix\" or \"efi/boot\"." + (let* ((arch (car (string-split (or (%current-target-system) + (%current-system)) + #\-))) + (efi-bootloader-link (string-append "boot" + (match arch + ("i686" "ia32") + ("x86_64" "x64") + ("armhf" "arm") + ("aarch64" "aa64") + ("riscv" "riscv32") + ("riscv64" "riscv64")) + ".efi")) + (efi-bootloader (string-append (match arch + ("i686" "i386") + ("x86_64" "x86_64") + ("armhf" "arm") + ("aarch64" "arm64") + ("riscv" "riscv32") + ("riscv64" "riscv64")) + "-efi/core.efi"))) + #~(lambda (bootloader target mount-point) + "Install GRUB as e.g. \"bootx64.efi\" or \"bootarm64.efi\" \"into +EFI-SUBDIR, which is usually \"efi/guix\" or \"efi/boot\" below the directory +TARGET for the system whose root is mounted at MOUNT-POINT." + (let* ((mount-point-list (delete "" (string-split mount-point #\/))) + (target-list (delete "" (string-split target #\/))) + (net-dir + (string-append "/" (string-join (append + mount-point-list + target-list) + "/"))) + (subdir #$efi-subdir) + (efi-bootloader-link + (string-append net-dir "/" subdir "/" #$efi-bootloader-link)) + (store-name (car (delete "" (string-split bootloader #\/)))) + (store + ;; Use target-list to construct a "../gnu" link with a correct + ;; number of "../" to the store. + (string-join (append (make-list (length target-list) "..") + (list store-name)) + "/")) + (store-link (string-append net-dir "/" store-name))) + ;; Tell 'grub-install' that there might be a LUKS-encrypted /boot or + ;; root partition. + (setenv "GRUB_ENABLE_CRYPTODISK" "y") + (invoke/quiet (string-append bootloader "/bin/grub-mknetdir") + (string-append "--net-directory=" net-dir) + (string-append "--subdir=" subdir)) + (catch 'system-error + (lambda () (delete-file efi-bootloader-link)) + (lambda _ #f)) + (symlink #$efi-bootloader + efi-bootloader-link) + (catch 'system-error + (lambda () (delete-file store-link)) + (lambda _ #f)) + (symlink store + store-link))))) + ^L ;;; @@ -464,6 +515,16 @@ fi~%")))) (name 'grub-efi) (package grub-efi))) +(define* (grub-efi-net-bootloader #:key (target #f) (efi-subdir #f)) + (let ((target (or target "boot")) + (efi-subdir (or efi-subdir "efi/boot"))) + (bootloader + (inherit grub-bootloader) + (name 'grub-efi-net-bootloader) + (package grub-efi) + (installer (install-grub-efi-net efi-subdir)) + (configuration-file (string-append target "/" efi-subdir "/grub.cfg"))))) + (define* grub-mkrescue-bootloader (bootloader (inherit grub-efi-bootloader) diff --git a/gnu/system.scm b/gnu/system.scm index 29e622872d..540f0e4a9e 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -297,7 +297,8 @@ file system labels." ((? string? device) ;; It used to be that we would not distinguish between labels and ;; device names. Try to infer the right thing here. - (if (string-prefix? "/dev/" device) + (if (or (string-prefix? "/dev/" device) + (string-contains device ":/")) ; nfs device (file-system-label device))))) -- 2.26.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.