From f2c403eab62513c88b27ec3e4db5130a476c06ca Mon Sep 17 00:00:00 2001
From: Ludovic Courtès
Date: Fri, 27 Jun 2014 17:54:29 +0200
Subject: 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.
---
 guix/scripts/system.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'guix/scripts')

diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index fc947e401..0c1bff94b 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))
-- 
cgit v1.3