From mboxrd@z Thu Jan 1 00:00:00 1970 From: csanchezdll@gmail.com (Carlos =?UTF-8?Q?S=C3=A1nchez?= de La Lama) Subject: bug#24344: [PATCH] Generate grub.cfg with correct paths when store is not in root partition Date: Tue, 13 Sep 2016 13:23:31 +0200 Message-ID: <7toa3s11sc.fsf@gmail.com> References: <7twpix5ck2.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjlot-0006tE-28 for bug-guix@gnu.org; Tue, 13 Sep 2016 07:24:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bjloo-0007QB-0a for bug-guix@gnu.org; Tue, 13 Sep 2016 07:24:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:60537) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjlon-0007Q5-S3 for bug-guix@gnu.org; Tue, 13 Sep 2016 07:24:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bjlon-0003Pl-Li for bug-guix@gnu.org; Tue, 13 Sep 2016 07:24:01 -0400 In-Reply-To: <7twpix5ck2.fsf@gmail.com> Sender: "Debbugs-submit" Resent-Message-ID: List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: 24344@debbugs.gnu.org Took a while to produce a working patch :S A little explanation of what it does: guix/scripts/system.scm: when constructing old entries, we know "systems" are the system symlinks in /var/guix/profile, and not a store derivation. No need for gexps then, which is good as resolving the symlink using "readlink" cannot be done by the builders /var is not in the chroot). gnu/system.scm: for the current system, initrd is inside the system derivattion in the store. Resolve the symlink at build time. gnu/system/grub.scm: strip the mount point on the paths GRUB will use, so GRUB modules, background images. kernels and initrds are correcty loaded. This is the first time I do something non-trivial in scheme, so there might be an easier way to achieve the same result. Nonetheless, I have tested it on my system and seems to work ok. * guix/scripts/system.scm (previous-grub-entries): resolve initrd symlink for old entries (on the host). * gnu/system.scm (operating-system-grub.cfg): resolve initrd symlink for current system (on the container). * gnu/system/grub.scm: strip mount-point from GRUB filenames. --- gnu/system.scm | 2 +- gnu/system/grub.scm | 29 ++++++++++++++++++++--------- guix/scripts/system.scm | 6 +++--- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 0802010..1346f49 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -723,7 +723,7 @@ listed in OS. The C library expects to find it under #~(string-append "--load=" #$system "/boot") (operating-system-kernel-arguments os))) - (initrd #~(string-append #$system "/initrd")))))) + (initrd #~(readlink (string-append #$system "/initrd"))))))) (grub-configuration-file (operating-system-bootloader os) store-fs entries #:old-entries old-entries))) diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm index 45b46ca..56cb081 100644 --- a/gnu/system/grub.scm +++ b/gnu/system/grub.scm @@ -62,6 +62,14 @@ ;;; ;;; Code: +(define (strip-mount-point fs file) + (let ((mount-point (file-system-mount-point fs))) + (if (string=? mount-point "/") + file + #~(if (string-prefix? #$mount-point #$file) + (substring #$file (string-length #$mount-point)) + #$file)))) + (define-record-type* grub-image make-grub-image grub-image? @@ -183,7 +191,8 @@ the store is. SYSTEM must be the target system string---e.g., (symbol->string (assoc-ref colors 'bg))))) (define font-file - #~(string-append #$grub "/share/grub/unicode.pf2")) + (strip-mount-point root-fs + #~(string-append #$grub "/share/grub/unicode.pf2"))) (mlet* %store-monad ((image (grub-background-image config))) (return (and image @@ -209,7 +218,7 @@ fi~%" #$(grub-root-search root-fs font-file) #$font-file - #$image + #$(strip-mount-point root-fs image) #$(theme-colors grub-theme-color-normal) #$(theme-colors grub-theme-color-highlight)))))) @@ -254,17 +263,19 @@ corresponding to old generations of the system." (define entry->gexp (match-lambda (($ label linux arguments initrd) - #~(format port "menuentry ~s { + (let ((linux (strip-mount-point store-fs linux)) + (initrd (strip-mount-point store-fs initrd))) + #~(format port "menuentry ~s { ~a linux ~a/~a ~a initrd ~a }~%" - #$label - #$(grub-root-search store-fs - #~(string-append #$linux "/" - #$linux-image-name)) - #$linux #$linux-image-name (string-join (list #$@arguments)) - #$initrd)))) + #$label + #$(grub-root-search store-fs + #~(string-append #$linux "/" + #$linux-image-name)) + #$linux #$linux-image-name (string-join (list #$@arguments)) + #$initrd))))) (mlet %store-monad ((sugar (eye-candy config store-fs system #~port))) (define builder diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 953c624..5ff98a0 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -391,10 +391,10 @@ it atomically, and then run OS's activation script." (linux kernel) (linux-arguments (cons* (string-append "--root=" root-device) - #~(string-append "--system=" #$system) - #~(string-append "--load=" #$system "/boot") + (string-append "--system=" system) + (string-append "--load=" system "/boot") kernel-arguments)) - (initrd #~(string-append #$system "/initrd")))))) + (initrd (readlink (string-append system "/initrd"))))))) (let* ((numbers (generation-numbers profile)) (systems (map (cut generation-file-name profile <>) --