forked from ungleich-public/cdist
use parameter defaults for chroot; re-export cdist log level to nested cdist run
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
parent
eb8922ebcd
commit
71b858e467
3 changed files with 2 additions and 23 deletions
|
@ -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 \
|
||||
|
|
|
@ -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")"
|
|
@ -0,0 +1 @@
|
|||
/target
|
Loading…
Reference in a new issue