From 71b858e46724b7ac2a908dbd1d10a5562ebd0375 Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Tue, 12 Dec 2017 00:15:54 +0100
Subject: [PATCH] use parameter defaults for chroot; re-export cdist log level
 to nested cdist run

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 .../conf/type/__install_config/gencode-local  |  1 +
 cdist/conf/type/__install_config/manifest     | 23 -------------------
 .../__install_config/parameter/default/chroot |  1 +
 3 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100755 cdist/conf/type/__install_config/manifest
 create mode 100644 cdist/conf/type/__install_config/parameter/default/chroot

diff --git a/cdist/conf/type/__install_config/gencode-local b/cdist/conf/type/__install_config/gencode-local
index a298a5cc..8f24cf2e 100755
--- a/cdist/conf/type/__install_config/gencode-local
+++ b/cdist/conf/type/__install_config/gencode-local
@@ -23,6 +23,7 @@ remote_exec="$__type/files/remote/exec"
 remote_copy="$__type/files/remote/copy"
 
 cat << DONE
+export __cdist_log_level=$__cdist_log_level
 export __default_remote_exec="$__remote_exec"
 export __default_remote_copy="$__remote_copy"
 cdist config \
diff --git a/cdist/conf/type/__install_config/manifest b/cdist/conf/type/__install_config/manifest
deleted file mode 100755
index b920d8ab..00000000
--- a/cdist/conf/type/__install_config/manifest
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh -e
-#
-# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-# set defaults
-chroot="$(cat "$__object/parameter/chroot" 2>/dev/null \
-   || echo "/target" | tee "$__object/parameter/chroot")"
diff --git a/cdist/conf/type/__install_config/parameter/default/chroot b/cdist/conf/type/__install_config/parameter/default/chroot
new file mode 100644
index 00000000..ea8c4bf7
--- /dev/null
+++ b/cdist/conf/type/__install_config/parameter/default/chroot
@@ -0,0 +1 @@
+/target