tom/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

do not change parameters

Browse source 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
Nico Schottelius 2014-01-20 13:50:42 +01:00
parent 5279b7239c
commit 29d4f910bc
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cdist/conf/type/__hostname/gencode-remote
View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# 2014 Steven Armstrong (steven-cdist at armstrong.cc) # 2014 Steven Armstrong (steven-cdist at armstrong.cc)
# 2014 Nico Schottelius (nico-cdist at schottelius.org)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -18,7 +19,12 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
if [ -f "$__object/parameter/name" ]; then
name="$(cat "$__object/parameter/name")" name="$(cat "$__object/parameter/name")"
else
name="$__target_host"
fi
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
echo "printf '%s\n' '$name' > /etc/hostname" echo "printf '%s\n' '$name' > /etc/hostname"

6
cdist/conf/type/__hostname/manifest
View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# 2012 Steven Armstrong (steven-cdist at armstrong.cc) # 2012 Steven Armstrong (steven-cdist at armstrong.cc)
# 2014 Nico Schottelius (nico-cdist at schottelius.org)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -18,10 +19,6 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
# set defaults
name="$(cat "$__object/parameter/name" 2>/dev/null \
|| echo "${__target_host%%.*}" | tee "$__object/parameter/name")"
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
not_supported() { not_supported() {
@ -33,7 +30,6 @@ not_supported() {
case "$os" in case "$os" in
archlinux|debian|ubuntu) archlinux|debian|ubuntu)
# handled in gencode-remote # handled in gencode-remote
# FIXED: hostname setup in archlinuz via rc.local ist outdated
: :
;; ;;
*) *)