From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50465) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d02Yx-0000c0-Nh for guix-patches@gnu.org; Mon, 17 Apr 2017 05:03:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d02Yu-0001YO-J4 for guix-patches@gnu.org; Mon, 17 Apr 2017 05:03:11 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:53311) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d02Yu-0001YJ-FX for guix-patches@gnu.org; Mon, 17 Apr 2017 05:03:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d02Yu-0005Ri-82 for guix-patches@gnu.org; Mon, 17 Apr 2017 05:03:08 -0400 Subject: bug#26339: [PATCH v2 10/12] scripts: system: Adapt "init" to new bootloader API. Resent-Message-ID: From: Mathieu Othacehe Date: Mon, 17 Apr 2017 11:01:46 +0200 Message-Id: <20170417090148.13791-11-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 * guix/scripts/system.scm (install): Pass install-proc as a new argument. Rename other arguments. Call install-bootloader instead of install-grub*. (perform-action): Adapt. --- guix/scripts/system.scm | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 1776dc00f..880bd8b56 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -178,12 +178,14 @@ TARGET, and register them." (define* (install os-drv target #:key (log-port (current-output-port)) - grub? grub.cfg device) - "Copy the closure of GRUB.CFG, which includes the output of OS-DRV, to + install-proc bootloader? + bootcfg bootcfg-location + device) + "Copy the closure of BOOTCFG, which includes the output of OS-DRV, to directory TARGET. TARGET must be an absolute directory name since that's what 'guix-register' expects. -When GRUB? is true, install GRUB on DEVICE, using GRUB.CFG." +When BOOTLOADER? is true, install bootloader on DEVICE, using BOOTCFG." (define (maybe-copy to-copy) (with-monad %store-monad (if (string=? target "/") @@ -212,16 +214,21 @@ the ownership of '~a' may be incorrect!~%") (populate (lift2 populate-root-file-system %store-monad))) (mbegin %store-monad - ;; Copy the closure of GRUB.CFG, which includes OS-DIR, GRUB's - ;; background image and so on. - (maybe-copy grub.cfg) + ;; Copy the closure of BOOTCFG, which includes OS-DIR, + ;; eventual background image and so on. + (maybe-copy + (derivation->output-path bootcfg)) ;; Create a bunch of additional files. (format log-port "populating '~a'...~%" target) (populate os-dir target) - (mwhen grub? - (install-grub* grub.cfg device target))))) + (mwhen bootloader? + (install-bootloader install-proc + #:bootcfg bootcfg + #:bootcfg-location bootcfg-location + #:device device + #:target target))))) ;;; @@ -698,8 +705,10 @@ output when building a system derivation, such as a disk image." (format #t (_ "initializing operating system under '~a'...~%") target) (install sys (canonicalize-path target) - #:grub? bootloader? - #:grub.cfg (derivation->output-path grub.cfg) + #:bootloader? bootloader? + #:bootcfg bootcfg + #:bootcfg-location bootcfg-location + #:install-proc install-proc #:device device)) (else ;; All we had to do was to build SYS and maybe register an -- 2.12.2