From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d02Ys-0000Y9-MZ for guix-patches@gnu.org; Mon, 17 Apr 2017 05:03:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d02Yo-0001ST-MK for guix-patches@gnu.org; Mon, 17 Apr 2017 05:03:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:53301) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d02Yo-0001SO-Gz for guix-patches@gnu.org; Mon, 17 Apr 2017 05:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d02Yo-0005QT-A1 for guix-patches@gnu.org; Mon, 17 Apr 2017 05:03:02 -0400 Subject: bug#26339: [PATCH v2 01/12] system: Pass to grub. Resent-Message-ID: From: Mathieu Othacehe Date: Mon, 17 Apr 2017 11:01:37 +0200 Message-Id: <20170417090148.13791-2-m.othacehe@gmail.com> In-Reply-To: <20170417090148.13791-1-m.othacehe@gmail.com> References: <20170417090148.13791-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 * 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 | 11 ++++++----- gnu/system/grub.scm | 13 +++++++++++-- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 89c4150f9..7c66f6088 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -742,16 +742,17 @@ populate the \"old entries\" menu." (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 (fs->boot-device store-fs)) - (device-mount-point + (store-device (fs->boot-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 cde4b9e23..f2838d633 100644 --- a/gnu/system/grub.scm +++ b/gnu/system/grub.scm @@ -267,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)) @@ -276,7 +285,7 @@ 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 + (append (map boot-parameters->menu-entry entries) (grub-configuration-menu-entries config))) (define entry->gexp @@ -323,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