From mboxrd@z Thu Jan 1 00:00:00 1970 From: cmmarusich@gmail.com Subject: [PATCH 01/10] * gnu/system.scm (): Add 'store-device' and 'store-fs-mount-point'. Date: Fri, 28 Oct 2016 03:07:18 -0700 Message-ID: <20161028100727.1182-2-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]:56782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c044m-0004Rr-2K for guix-devel@gnu.org; Fri, 28 Oct 2016 06:07:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c044h-0003y2-Ny for guix-devel@gnu.org; Fri, 28 Oct 2016 06:07:52 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:35263) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c044h-0003xl-B8 for guix-devel@gnu.org; Fri, 28 Oct 2016 06:07:47 -0400 Received: by mail-pf0-x244.google.com with SMTP id s8so876524pfj.2 for ; Fri, 28 Oct 2016 03:07:47 -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 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 | 58 +++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 9 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 38ae8f1..ff84b63 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015, 2016 Alex Kost +;;; Copyright © 2016 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -99,6 +100,8 @@ boot-parameters? boot-parameters-label boot-parameters-root-device + boot-parameters-store-device + boot-parameters-store-fs-mount-point boot-parameters-kernel boot-parameters-kernel-arguments boot-parameters-initrd @@ -750,17 +753,25 @@ listed in OS. The C library expects to find it under this file is the reconstruction of GRUB menu entries for old configurations." (mlet %store-monad ((initrd (operating-system-initrd-file os)) (root -> (operating-system-root-file-system os)) + (store -> (operating-system-store-file-system os)) (label -> (kernel->grub-label (operating-system-kernel os)))) - (gexp->file "parameters" - #~(boot-parameters (version 0) - (label #$label) - (root-device #$(file-system-device root)) - (kernel #$(operating-system-kernel-file os)) - (kernel-arguments - #$(operating-system-kernel-arguments os)) - (initrd #$initrd)) - #:set-load-path? #f))) + (gexp->file + "parameters" + #~(boot-parameters (version 1) + (label #$label) + (root-device #$(file-system-device root)) + (store-device + #$(case (file-system-title store) + ((uuid) (file-system-device store)) + ((label) (file-system-device store)) + (else #f))) + (store-fs-mount-point #$(file-system-mount-point store)) + (kernel #$(operating-system-kernel-file os)) + (kernel-arguments + #$(operating-system-kernel-arguments os)) + (initrd #$initrd)) + #:set-load-path? #f))) ;;; @@ -770,7 +781,16 @@ this file is the reconstruction of GRUB menu entries for old configurations." (define-record-type* boot-parameters make-boot-parameters boot-parameters? (label boot-parameters-label) + ;; Because we will use the 'store-device' to create the GRUB search command, + ;; the 'store-device' has slightly different semantics than 'root-device'. + ;; The 'store-device' can be a file system uuid, a file system label, or #f, + ;; but it cannot be a device path such as "/dev/sda3", since GRUB would not + ;; understand that. The 'root-device', on the other hand, corresponds + ;; exactly to the device field of the object representing the + ;; OS's root file system, so it might be a device path like "/dev/sda3". (root-device boot-parameters-root-device) + (store-device boot-parameters-store-device) + (store-fs-mount-point boot-parameters-store-fs-mount-point) (kernel boot-parameters-kernel) (kernel-arguments boot-parameters-kernel-arguments) (initrd boot-parameters-initrd)) @@ -786,6 +806,10 @@ this file is the reconstruction of GRUB menu entries for old configurations." (boot-parameters (label label) (root-device root) + ;; For backwards compatibility, we assume the store device and the + ;; root device are the same. + (store-device root) + (store-fs-mount-point "/") ;; In the past, we would store the directory name of the kernel instead ;; of the absolute file name of its image. Detect that and correct it. @@ -805,6 +829,22 @@ this file is the reconstruction of GRUB menu entries for old configurations." (string-append directory file)) (('initrd (? string? file)) file))))) + (('boot-parameters ('version 1) + ('label label) + ('root-device root) + ('store-device store) + ('store-fs-mount-point store-fs-mount-point) + ('kernel linux) + ('kernel-arguments arguments) + ('initrd initrd)) + (boot-parameters + (label label) + (root-device root) + (store-device store) + (store-fs-mount-point store-fs-mount-point) + (kernel linux) + (kernel-arguments arguments) + (initrd initrd))) (x ;unsupported format (warning (_ "unrecognized boot parameters for '~a'~%") system) -- 2.9.2