unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Mathieu Othacehe <m.othacehe@gmail.com>
To: 26339@debbugs.gnu.org
Subject: bug#26339: [PATCH v3 7/9] scripts: system: Adapt "init" to new bootloader API.
Date: Sat,  6 May 2017 17:41:52 +0200	[thread overview]
Message-ID: <20170506154154.17836-8-m.othacehe@gmail.com> (raw)
In-Reply-To: <20170506154154.17836-1-m.othacehe@gmail.com>

* guix/scripts/system.scm (install): Pass installer a new
argument. Rename other arguments.
Call install-bootloader instead of install-grub*.
(perform-action): Adapt.
---
 guix/scripts/system.scm | 46 ++++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 0a066853a..b3e2d7b72 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
+                  installer install-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 INSTALL-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 install-bootloader?
+        (install-bootloader installer
+                            #:bootcfg bootcfg
+                            #:bootcfg-location bootcfg-location
+                            #:device device
+                            #:target target)))))
 
 \f
 ;;;
@@ -589,12 +596,13 @@ PATTERN, a string.  When PATTERN is #f, display all the system generations."
                                            #$target))))))
 
 (define* (perform-action action os
-                         #:key bootloader? dry-run? derivations-only?
+                         #:key install-bootloader?
+                         dry-run? derivations-only?
                          use-substitutes? device target
                          image-size full-boot?
                          (mappings '())
                          (gc-root #f))
-  "Perform ACTION for OS.  BOOTLOADER? specifies whether to install
+  "Perform ACTION for OS.  INSTALL-BOOTLOADER? specifies whether to install
 bootloader; DEVICE is the target devices for bootloader; TARGET is the target
 root directory; IMAGE-SIZE is the size of the image to be built, for the
 'vm-image' and 'disk-image' actions.  FULL-BOOT? is used for the 'vm' action;
@@ -630,7 +638,7 @@ output when building a system derivation, such as a disk image."
                           (profile-boot-parameters)))))
        (bootcfg-location -> (bootloader-configuration-file-name
                              (operating-system-bootloader os)))
-       (install-proc
+       (installer
         (let ((procedure (bootloader-configuration-installer
                           (operating-system-bootloader os)))
               (target    (or target "/")))
@@ -640,8 +648,8 @@ output when building a system derivation, such as a disk image."
        ;; --no-bootloader is passed, because we then use it as a GC root.
        ;; See <http://bugs.gnu.org/21068>.
        (drvs   -> (if (memq action '(init reconfigure))
-                      (if (and bootloader? bootloader)
-                          (list sys bootcfg bootloader install-proc)
+                      (if (and install-bootloader? bootloader)
+                          (list sys bootcfg bootloader installer)
                           (list sys bootcfg))
                       (list sys)))
        (%         (if derivations-only?
@@ -660,8 +668,8 @@ output when building a system derivation, such as a disk image."
             ((reconfigure)
              (mbegin %store-monad
                (switch-to-system os)
-               (mwhen bootloader?
-                 (install-bootloader install-proc
+               (mwhen install-bootloader?
+                 (install-bootloader installer
                                      #:bootcfg bootcfg
                                      #:bootcfg-location bootcfg-location
                                      #:device device
@@ -671,8 +679,10 @@ output when building a system derivation, such as a disk image."
              (format #t (G_ "initializing operating system under '~a'...~%")
                      target)
              (install sys (canonicalize-path target)
-                      #:grub? bootloader?
-                      #:grub.cfg (derivation->output-path grub.cfg)
+                      #:install-bootloader? install-bootloader?
+                      #:bootcfg bootcfg
+                      #:bootcfg-location bootcfg-location
+                      #:installer installer
                       #:device device))
             (else
              ;; All we had to do was to build SYS and maybe register an
@@ -884,7 +894,7 @@ resulting from command-line parsing."
                                                        m)
                                                       (_ #f))
                                                     opts)
-                             #:bootloader? bootloader?
+                             #:install-bootloader? bootloader?
                              #:target target #:device device
                              #:gc-root (assoc-ref opts 'gc-root)))))
         #:system system))))
-- 
2.12.2

  parent reply	other threads:[~2017-05-06 15:43 UTC|newest]

Thread overview: 193+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-02 13:49 bug#26339: [PATCH 00/18] wip: Support non grub bootloaders Mathieu Othacehe
2017-04-02 13:52 ` bug#26339: [PATCH 01/18] system: Pass <bootloader-parameter> to grub Mathieu Othacehe
2017-04-02 13:52   ` bug#26339: [PATCH 02/18] system: Add extlinux support Mathieu Othacehe
2017-04-15 16:03     ` Danny Milosavljevic
2017-05-08 20:06     ` Ludovic Courtès
2017-05-09  7:38       ` Mathieu Othacehe
2017-05-09  9:51         ` Ludovic Courtès
2017-05-09 14:30           ` Mathieu Othacehe
2017-05-09 20:40             ` Ludovic Courtès
2017-05-12  0:02               ` Danny Milosavljevic
2017-05-12  8:26                 ` Ludovic Courtès
2017-05-12 11:26                   ` Danny Milosavljevic
2017-05-12 11:36                     ` Ludovic Courtès
2017-05-12 12:18                       ` Mathieu Othacehe
2017-05-13  9:53                         ` Danny Milosavljevic
2017-05-14  7:49                           ` Mathieu Othacehe
2017-05-09 10:25         ` Ludovic Courtès
2017-05-09 14:32           ` Mathieu Othacehe
2017-04-02 13:52   ` bug#26339: [PATCH 03/18] scripts: system: Rename --no-grub option to --no-bootloader Mathieu Othacehe
2017-04-15 10:10     ` Danny Milosavljevic
2017-04-16  9:58       ` Ludovic Courtès
2017-04-02 13:52   ` bug#26339: [PATCH 04/18] bootloader: Add install procedures and use them Mathieu Othacehe
2017-04-15 16:22     ` Danny Milosavljevic
2017-04-15 17:15       ` Mathieu Othacehe
2017-04-16 21:37         ` Danny Milosavljevic
2017-04-17  8:49           ` Mathieu Othacehe
2017-04-18  8:23             ` Ludovic Courtès
2017-04-02 13:52   ` bug#26339: [PATCH 05/18] system: Rename operating-system-grub.cfg to operating-system-bootcfg Mathieu Othacehe
2017-04-15 12:44     ` Danny Milosavljevic
2017-04-02 13:52   ` bug#26339: [PATCH 06/18] vm: Reword grub.cfg to boot.cfg Mathieu Othacehe
2017-04-15 12:43     ` Danny Milosavljevic
2017-04-02 13:52   ` bug#26339: [PATCH 07/18] system: Add bootloader type Mathieu Othacehe
2017-04-15 16:26     ` Danny Milosavljevic
2017-04-15 17:23       ` Mathieu Othacehe
2017-04-15 20:16         ` Danny Milosavljevic
2017-04-02 13:52   ` bug#26339: [PATCH 08/18] bootloader: Stop using grub module Mathieu Othacehe
2017-04-15 13:33     ` Danny Milosavljevic
2017-04-15 16:44     ` Danny Milosavljevic
2017-04-02 13:52   ` bug#26339: [PATCH 09/18] scripts: system: Move save-load-path-excursion and save-environment-excursion macros to the top Mathieu Othacehe
2017-04-15 10:35     ` Danny Milosavljevic
2017-04-15 10:46       ` Mathieu Othacehe
2017-04-15 11:30         ` Danny Milosavljevic
2017-04-15 11:41           ` Mathieu Othacehe
2017-04-15 11:52             ` Danny Milosavljevic
2017-04-02 13:52   ` bug#26339: [PATCH 10/18] system: Rename kernel->grub-label to kernel->boot-label Mathieu Othacehe
2017-04-15 10:40     ` Danny Milosavljevic
2017-04-02 13:52   ` bug#26339: [PATCH 11/18] bootloader: Add device and type to bootloader-configuration record Mathieu Othacehe
2017-04-02 13:52   ` bug#26339: [PATCH 12/18] system: Rename grub-device to fs->boot-device Mathieu Othacehe
2017-04-15 12:45     ` Danny Milosavljevic
2017-04-02 13:52   ` bug#26339: [PATCH 13/18] scripts: system: Remove unused variables Mathieu Othacehe
2017-04-02 13:52   ` bug#26339: [PATCH 14/18] scripts: system: Rename grub? and install-grub? to bootloader? and install-bootloader? Mathieu Othacehe
2017-04-15 13:25     ` Danny Milosavljevic
2017-04-02 13:52   ` bug#26339: [PATCH 15/18] scripts: system: Adapt "reconfigure" to new bootloader API Mathieu Othacehe
2017-04-02 13:52   ` bug#26339: [PATCH 16/18] scripts: system: Adapt "init" " Mathieu Othacehe
2017-04-02 13:52   ` bug#26339: [PATCH 17/18] scripts: system: Adapt "switch-generation" " Mathieu Othacehe
2017-04-15 16:47     ` Danny Milosavljevic
2017-04-15 17:27       ` Mathieu Othacehe
2017-05-05  7:13         ` Danny Milosavljevic
2017-05-05  7:21           ` Mathieu Othacehe
     [not found]       ` <871sstilgo.fsf@gmail.com>
     [not found]         ` <20170415231819.GA23955@jasmine>
     [not found]           ` <20170416012225.6d00e7c9@scratchpost.org>
2017-04-15 23:56             ` bug#26339: problem with commit abae042 Leo Famulari
2017-04-02 13:52   ` bug#26339: [PATCH 18/18] scripts: system: Display bootloader device and type in "list-generations" Mathieu Othacehe
2017-04-02 18:24   ` bug#26339: [PATCH 01/18] system: Pass <bootloader-parameter> to grub David Craven
2017-04-15 13:04   ` Danny Milosavljevic
2017-04-15 13:58   ` Danny Milosavljevic
2017-04-15 15:39     ` Danny Milosavljevic
2017-04-15 20:17   ` Danny Milosavljevic
2017-04-17  9:01 ` bug#26339: [PATCH v2 00/12] Support for non grub bootloaders Mathieu Othacehe
2017-04-17  9:01   ` bug#26339: [PATCH v2 01/12] system: Pass <bootloader-parameter> to grub Mathieu Othacehe
2017-04-17 17:08     ` Danny Milosavljevic
2017-05-08  9:37     ` Ludovic Courtès
2017-05-08 13:51       ` Danny Milosavljevic
2017-05-08 15:00         ` Mathieu Othacehe
2017-05-09 14:16           ` Marius Bakke
2017-05-09 14:36             ` Mathieu Othacehe
2017-05-08 19:47         ` Ludovic Courtès
2017-05-08 20:04           ` Danny Milosavljevic
2017-05-09  7:03             ` Ludovic Courtès
2017-05-09  7:21               ` Danny Milosavljevic
2017-05-09  9:45                 ` Ludovic Courtès
2017-05-08 20:16           ` bug#26339: [PATCH] system: Remove circular dependency between (gnu system) and (gnu system grub) Danny Milosavljevic
2017-05-08 21:01             ` Danny Milosavljevic
2017-05-08 14:53       ` bug#26339: [PATCH v2 01/12] system: Pass <bootloader-parameter> to grub Mathieu Othacehe
2017-04-17  9:01   ` bug#26339: [PATCH v2 02/12] system: Add extlinux support Mathieu Othacehe
2017-04-17  9:01   ` bug#26339: [PATCH v2 03/12] scripts: system: Rename --no-grub option to --no-bootloader Mathieu Othacehe
2017-04-17 15:54     ` Danny Milosavljevic
2017-04-17  9:01   ` bug#26339: [PATCH v2 04/12] bootloader: Add install procedures and use them Mathieu Othacehe
2017-04-17  9:01   ` bug#26339: [PATCH v2 05/12] system: Add bootloader type Mathieu Othacehe
2017-04-17  9:01   ` bug#26339: [PATCH v2 06/12] bootloader: Stop using grub module Mathieu Othacehe
2017-04-17  9:01   ` bug#26339: [PATCH v2 07/12] bootloader: Add device and type to bootloader-configuration record Mathieu Othacehe
2017-04-17  9:01   ` bug#26339: [PATCH v2 08/12] scripts: system: Remove unused variables Mathieu Othacehe
2017-04-17  9:01   ` bug#26339: [PATCH v2 09/12] scripts: system: Adapt "reconfigure" to new bootloader API Mathieu Othacehe
2017-04-17  9:01   ` bug#26339: [PATCH v2 10/12] scripts: system: Adapt "init" " Mathieu Othacehe
2017-04-23  8:39     ` Danny Milosavljevic
2017-04-23  8:53       ` Danny Milosavljevic
2017-04-23 16:38         ` Mathieu Othacehe
2017-04-23 16:34       ` Mathieu Othacehe
2017-04-17  9:01   ` bug#26339: [PATCH v2 11/12] scripts: system: Adapt "switch-generation" " Mathieu Othacehe
2017-04-17  9:01   ` bug#26339: [PATCH v2 12/12] scripts: system: Display bootloader device and type in "list-generations" Mathieu Othacehe
2017-05-06 15:41 ` bug#26339: [PATCH v3 0/9] Support non-grub bootloaders Mathieu Othacehe
2017-05-06 15:41   ` bug#26339: [PATCH v3 1/9] system: Add extlinux support Mathieu Othacehe
2017-05-07 16:41     ` Danny Milosavljevic
2017-05-07 20:01       ` Mathieu Othacehe
2017-05-06 15:41   ` bug#26339: [PATCH v3 2/9] bootloader: Add install procedures and use them Mathieu Othacehe
2017-05-07 16:52     ` Danny Milosavljevic
2017-05-06 15:41   ` bug#26339: [PATCH v3 3/9] system: Add bootloader type Mathieu Othacehe
2017-05-07 16:55     ` Danny Milosavljevic
2017-05-06 15:41   ` bug#26339: [PATCH v3 4/9] bootloader: Stop using grub module Mathieu Othacehe
2017-05-07 16:53     ` Danny Milosavljevic
2017-05-06 15:41   ` bug#26339: [PATCH v3 5/9] bootloader: Add device and type to bootloader-configuration record Mathieu Othacehe
2017-05-07 20:59     ` Danny Milosavljevic
2017-05-06 15:41   ` bug#26339: [PATCH v3 6/9] scripts: system: Adapt "reconfigure" to new bootloader API Mathieu Othacehe
2017-05-07 20:33     ` Danny Milosavljevic
2017-05-07 20:56       ` Danny Milosavljevic
2017-05-08 16:24         ` Mathieu Othacehe
2017-05-08 16:21       ` Mathieu Othacehe
2017-05-07 21:14     ` Danny Milosavljevic
2017-05-08 16:27       ` Mathieu Othacehe
2017-05-06 15:41   ` Mathieu Othacehe [this message]
2017-05-07 21:08     ` bug#26339: [PATCH v3 7/9] scripts: system: Adapt "init" " Danny Milosavljevic
2017-05-08 16:26       ` Mathieu Othacehe
2017-05-06 15:41   ` bug#26339: [PATCH v3 8/9] scripts: system: Adapt "switch-generation" " Mathieu Othacehe
2017-05-07 20:54     ` Danny Milosavljevic
2017-05-08 16:22       ` Mathieu Othacehe
2017-05-06 15:41   ` bug#26339: [PATCH v3 9/9] scripts: system: Display bootloader device and type in "list-generations" Mathieu Othacehe
2017-05-07 16:57     ` Danny Milosavljevic
2017-05-14  7:47 ` bug#26339: [PATCH v4 0/7] Support non grub bootloaders Mathieu Othacehe
2017-05-14  7:47   ` bug#26339: [PATCH v4 1/7] bootloader: Add extlinux support Mathieu Othacehe
2017-05-14  8:43     ` Danny Milosavljevic
2017-05-16 12:46       ` Mathieu Othacehe
2017-05-14 13:25     ` Ludovic Courtès
2017-05-16 12:51       ` Mathieu Othacehe
2017-05-16 14:38         ` Danny Milosavljevic
2017-05-16 14:50           ` Mathieu Othacehe
2017-05-16 15:00             ` Danny Milosavljevic
2017-05-16 15:03               ` Mathieu Othacehe
2017-05-14 13:35     ` Ludovic Courtès
2017-05-16 12:55       ` Mathieu Othacehe
2017-05-14  7:47   ` bug#26339: [PATCH v4 2/7] bootloader: Adapt vm to new bootloader API Mathieu Othacehe
2017-05-14  8:47     ` Danny Milosavljevic
2017-05-14 13:28     ` Ludovic Courtès
2017-05-14 14:59       ` Danny Milosavljevic
2017-05-14 19:53         ` Ludovic Courtès
2017-05-14  7:47   ` bug#26339: [PATCH v4 3/7] bootloader: Add bootloader name to boot-parameters record Mathieu Othacehe
2017-05-14  8:47     ` Danny Milosavljevic
2017-05-14 13:29       ` Ludovic Courtès
2017-05-14  7:48   ` bug#26339: [PATCH v4 4/7] scripts: system: Adapt "reconfigure" to new bootloader API Mathieu Othacehe
2017-05-14  8:50     ` Danny Milosavljevic
2017-05-14 13:31     ` Ludovic Courtès
2017-05-14  7:48   ` bug#26339: [PATCH v4 5/7] scripts: system: Adapt "init" " Mathieu Othacehe
2017-05-14  8:51     ` Danny Milosavljevic
2017-05-14 13:31       ` Ludovic Courtès
2017-05-14  7:48   ` bug#26339: [PATCH v4 6/7] scripts: system: Adapt "switch-generation" " Mathieu Othacehe
2017-05-14  8:52     ` Danny Milosavljevic
2017-05-14 13:32       ` Ludovic Courtès
2017-05-14  8:54     ` Danny Milosavljevic
2017-05-16 12:46       ` Mathieu Othacehe
2017-05-14  7:48   ` bug#26339: [PATCH v4 7/7] scripts: system: Display bootloader name in "list-generations" Mathieu Othacehe
2017-05-14 13:33     ` Ludovic Courtès
2017-05-16 13:03 ` bug#26339: [PATCH] doc: Adapt to multiple bootloader support Mathieu Othacehe
2017-05-20 20:49   ` Danny Milosavljevic
2017-05-22  8:11     ` Mathieu Othacehe
2017-05-20 21:12   ` Tomáš Čech
2017-05-20 21:19     ` Mathieu Othacehe
2017-05-18 10:13 ` bug#26339: [PATCH] bootloader: extlinux: Add extlinux-bootloader-gpt Mathieu Othacehe
2017-06-12 20:23   ` [bug#26339] " Ludovic Courtès
2017-06-13 17:52     ` Mathieu Othacehe
2017-06-14  7:37       ` Ludovic Courtès
2017-06-13 14:34   ` Danny Milosavljevic
2017-05-18 10:26 ` bug#26339: [PATCH] tests: Add syslinux gpt test Mathieu Othacehe
2017-06-12 20:29   ` [bug#26339] " Ludovic Courtès
2017-06-19 16:55     ` Mathieu Othacehe
2017-06-20 20:13       ` Ludovic Courtès
2017-06-21  8:05         ` Mathieu Othacehe
2017-05-21 13:57 ` bug#26339: [PATCH] scripts: system: Handle unspecified bootloader package and installer Mathieu Othacehe
2017-06-12 20:32   ` [bug#26339] " Ludovic Courtès
2017-06-10  8:53 ` bug#26339: [PATCH] bootloader: Rename boot-name to bootloader-name Mathieu Othacehe
2017-06-10 14:26   ` Ludovic Courtès
2017-06-10 16:33     ` Mathieu Othacehe
2017-06-11  8:42     ` Mathieu Othacehe
2017-06-11  9:54       ` bug#26339: "extlinux", "extlinux" gpt, bootloader-configuration without package nor installer Danny Milosavljevic
2017-06-11 10:13         ` Danny Milosavljevic
2017-06-12  9:58         ` [bug#26339] " Mathieu Othacehe
2017-06-12 20:09           ` Ludovic Courtès
2017-06-12 20:20         ` Ludovic Courtès
2017-06-13  5:07           ` Danny Milosavljevic
2017-10-04 14:55             ` Ludovic Courtès
2017-10-04 19:56               ` Mathieu Othacehe
2017-10-13 14:08 ` bug#26339: closing bootloader serie Mathieu Othacehe
2017-10-13 15:31   ` [bug#26339] " Ludovic Courtès
2017-10-26  9:43     ` Mathieu Othacehe
2017-10-26 17:14       ` Ludovic Courtès
2017-10-26 17:33         ` Mathieu Othacehe
2017-10-26 22:20           ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170506154154.17836-8-m.othacehe@gmail.com \
    --to=m.othacehe@gmail.com \
    --cc=26339@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).