diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-06-27 17:54:29 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-06-27 19:06:08 +0200 |
| commit | f2c403eab62513c88b27ec3e4db5130a476c06ca (patch) | |
| tree | 3db7245bffea0dff281a2c626cb6e8786805ba11 /guix/scripts/system.scm | |
| parent | dff624230a47a25d64ab5bd10378ca0e7053bd33 (diff) | |
| download | guix-patches-f2c403eab62513c88b27ec3e4db5130a476c06ca.tar guix-patches-f2c403eab62513c88b27ec3e4db5130a476c06ca.tar.gz | |
system: Install /var/guix/profiles/system-1-link on new systems.
* guix/build/install.scm (directives): Add /var/guix/profiles/system.
(populate-root-file-system): Add 'system' parameter. Create
/var/guix/profiles/system-1-link.
* guix/scripts/system.scm (install): Pass OS-DIR to
'populate-root-file-system'.
* guix/build/vm.scm (initialize-root-partition): Add #:system-directory
parameter, and pass it to 'populate-root-file-system'.
(initialize-hard-disk): Add #:system-directory parameter, and pass it
to 'initialize-root-partition'.
* gnu/system/vm.scm (qemu-image): Add #:os-derivation parameter and pass
it to 'initialize-hard-disk'.
(system-disk-image, system-qemu-image,
system-qemu-image/shared-store): Pass #:os-derivation to 'qemu-image.
Diffstat (limited to 'guix/scripts/system.scm')
| -rw-r--r-- | guix/scripts/system.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index fc947e4016..0c1bff94b6 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -116,7 +116,7 @@ When GRUB? is true, install GRUB on DEVICE, using GRUB.CFG." ;; Create a bunch of additional files. (format log-port "populating '~a'...~%" target) - (populate-root-file-system target) + (populate-root-file-system os-dir target) (when grub? (unless (false-if-exception (install-grub grub.cfg device target)) |