From f916b84ebd6629d7471f50fbb468161285f5026e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 2 Jan 2016 17:31:06 +0100
Subject: k default: root path for populate

---
 krebs/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'krebs/default.nix')

diff --git a/krebs/default.nix b/krebs/default.nix
index 81ddd3ea..15d0e8e2 100644
--- a/krebs/default.nix
+++ b/krebs/default.nix
@@ -50,7 +50,6 @@ let out = {
 
       # Prepare target source via bind-mounting
 
-      (${populate (args // { infesting = true;}) })
 
       (${nixos-install args})
 
@@ -103,6 +102,7 @@ let out = {
       #! /bin/sh
       # ${current-date} ${current-user-name}@${current-host-name}
       # krebs.nixos-install
+      (${populate (args // { root = "/mnt"; })})
 
       ${rootssh target ''
         export PATH; PATH=/root/.nix-profile/bin:$PATH
@@ -209,7 +209,7 @@ let out = {
   populate =
     { system ? current-host-name
     , target ? system
-    , infesting ? false
+    , root ? ""
     }@args:
     let out = ''
         #! /bin/sh
@@ -223,7 +223,6 @@ let out = {
       '';
 
 
-      target_prefix=lib.optionalString infesting "/mnt";
       config = get-config system;
 
       current-host = config.krebs.hosts.${current-host-name};
@@ -232,7 +231,7 @@ let out = {
       methods.dir = config:
         let
           can-push = config.host.name == current-host.name;
-          target-path = target_prefix + config.target-path;
+          target-path = root + config.target-path;
           push-method = ''
             rsync \
               --exclude .git \
@@ -252,7 +251,7 @@ let out = {
         throw "No way to push ${dir} from ${current-host.name} to ${target}";
 
       methods.git = config:
-        let target-path = target_prefix + config.target-path;
+        let target-path = root + config.target-path;
         in rootssh target ''
           mkdir -p ${target-path}
           cd ${target-path}
-- 
cgit v1.2.3