From mboxrd@z Thu Jan 1 00:00:00 1970 From: cmmarusich@gmail.com Subject: [PATCH 02/10] Add 'device' field to Date: Fri, 28 Oct 2016 03:07:19 -0700 Message-ID: <20161028100727.1182-3-cmmarusich@gmail.com> References: <20161028100727.1182-1-cmmarusich@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c044j-0004QY-9l for guix-devel@gnu.org; Fri, 28 Oct 2016 06:07:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c044i-0003yC-BK for guix-devel@gnu.org; Fri, 28 Oct 2016 06:07:49 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:33562) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c044i-0003xr-2P for guix-devel@gnu.org; Fri, 28 Oct 2016 06:07:48 -0400 Received: by mail-pf0-x243.google.com with SMTP id i85so872154pfa.0 for ; Fri, 28 Oct 2016 03:07:48 -0700 (PDT) In-Reply-To: <20161028100727.1182-1-cmmarusich@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org From: Chris Marusich * gnu/system/grub.scm (): add field 'device'. * gnu/system.scm (grub-configuration-file): use a dummy value for 'device'. * guix/scripts/system.scm (previous-grub-entries): use a dummy value for 'device'. In a future commit, we will restructure the grub.cfg generation logic to use this information, to enable the implementation of 'guix system switch-generation' and 'guix system roll-back'. --- gnu/system.scm | 1 + gnu/system/grub.scm | 4 +++- guix/scripts/system.scm | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/system.scm b/gnu/system.scm index ff84b63..f9f63a0 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -736,6 +736,7 @@ listed in OS. The C library expects to find it under (file-system-device root-fs))) (entries -> (list (menu-entry (label label) + (device #f) ;; stub value, not used yet (linux kernel) (linux-arguments (cons* (string-append "--root=" root-device) diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm index 249b415..859f33a 100644 --- a/gnu/system/grub.scm +++ b/gnu/system/grub.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2016 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -121,6 +122,7 @@ object denoting a file name." menu-entry make-menu-entry menu-entry? (label menu-entry-label) + (device menu-entry-device) ; file system uuid, label, or #f (linux menu-entry-linux) (linux-arguments menu-entry-linux-arguments (default '())) ; list of string-valued gexps @@ -262,7 +264,7 @@ corresponding to old generations of the system." (define entry->gexp (match-lambda - (($ label linux arguments initrd) + (($ label device linux arguments initrd) ;; Use the right file names for LINUX and STORE-FS in case STORE-FS is ;; not the "/" file system. (let ((linux (strip-mount-point store-fs linux)) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 0519ab8..8f0b8cd 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2016 Alex Kost +;;; Copyright © 2016 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -384,6 +385,7 @@ it atomically, and then run OS's activation script." (label (string-append label " (#" (number->string number) ", " (seconds->string time) ")")) + (device #f) ; stub value, not used yet (linux kernel) (linux-arguments (cons* (string-append "--root=" root-device) -- 2.9.2