From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44067) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cufxF-0002Tp-63 for guix-patches@gnu.org; Sun, 02 Apr 2017 09:54:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cufxC-0000Mu-4z for guix-patches@gnu.org; Sun, 02 Apr 2017 09:54:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:58364) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cufxC-0000Mg-0p for guix-patches@gnu.org; Sun, 02 Apr 2017 09:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cufxB-0000az-Nz for guix-patches@gnu.org; Sun, 02 Apr 2017 09:54:01 -0400 Subject: bug#26339: [PATCH 01/18] system: Pass to grub. References: <20170402134916.2871-1-m.othacehe@gmail.com> In-Reply-To: <20170402134916.2871-1-m.othacehe@gmail.com> Resent-Message-ID: From: Mathieu Othacehe Date: Sun, 2 Apr 2017 15:52:25 +0200 Message-Id: <20170402135242.2958-1-m.othacehe@gmail.com> 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: 26339@debbugs.gnu.org Cc: David Craven From: David Craven * gnu/system.scm (operating-system-grub.cfg): Pass . * gnu/system/grub.scm (boot-parameters->menu-entry): New variable. (grub-configuration-file): Use boot-parameters->menu-entry. --- gnu/system.scm | 12 +++++++----- gnu/system/grub.scm | 19 +++++++++++++++---- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 0f52351cf..d528c4a6a 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -99,6 +99,7 @@ system-linux-image-file-name + boot-parameters boot-parameters? boot-parameters-label @@ -741,16 +742,17 @@ listed in OS. The C library expects to find it under (root-device -> (if (eq? 'uuid (file-system-title root-fs)) (uuid->string (file-system-device root-fs)) (file-system-device root-fs))) - (entries -> (list (menu-entry + (entries -> (list (boot-parameters (label label) + (root-device root-device) ;; The device where the kernel and initrd live. - (device (grub-device store-fs)) - (device-mount-point + (store-device (grub-device store-fs)) + (store-mount-point (file-system-mount-point store-fs)) - (linux kernel) - (linux-arguments + (kernel kernel) + (kernel-arguments (cons* (string-append "--root=" root-device) #~(string-append "--system=" #$system) #~(string-append "--load=" #$system diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm index 4f9bde6a6..f2838d633 100644 --- a/gnu/system/grub.scm +++ b/gnu/system/grub.scm @@ -26,6 +26,7 @@ #:use-module (guix gexp) #:use-module (guix download) #:use-module (gnu artwork) + #:use-module (gnu system) #:use-module (gnu system file-systems) #:autoload (gnu packages bootloaders) (grub) #:autoload (gnu packages compression) (gzip) @@ -266,6 +267,15 @@ code." (#f #~(format #f "search --file --set ~a" #$file))))) +(define (boot-parameters->menu-entry conf) + (menu-entry + (label (boot-parameters-label conf)) + (device (boot-parameters-store-device conf)) + (device-mount-point (boot-parameters-store-mount-point conf)) + (linux (boot-parameters-kernel conf)) + (linux-arguments (boot-parameters-kernel-arguments conf)) + (initrd (boot-parameters-initrd conf)))) + (define* (grub-configuration-file config entries #:key (system (%current-system)) @@ -275,7 +285,8 @@ code." object. OLD-ENTRIES is taken to be a list of menu entries corresponding to old generations of the system." (define all-entries - (append entries (grub-configuration-menu-entries config))) + (append (map boot-parameters->menu-entry entries) + (grub-configuration-menu-entries config))) (define entry->gexp (match-lambda @@ -298,9 +309,9 @@ corresponding to old generations of the system." #$initrd))))) (mlet %store-monad ((sugar (eye-candy config - (menu-entry-device (first entries)) + (menu-entry-device (first all-entries)) (menu-entry-device-mount-point - (first entries)) + (first all-entries)) #:system system #:port #~port))) (define builder @@ -321,7 +332,7 @@ set timeout=~a~%" #$@(if (pair? old-entries) #~((format port " submenu \"GNU system, old configurations...\" {~%") - #$@(map entry->gexp old-entries) + #$@(map entry->gexp (map boot-parameters->menu-entry old-entries)) (format port "}~%")) #~())))) -- 2.12.2