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

allow hostnamectl to fail silently

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2017-08-29 22:50:47 +02:00
parent 0114001627
commit 3c3b29f710
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
#!/bin/sh -e #!/bin/sh -e
# #
# 2014 Steven Armstrong (steven-cdist at armstrong.cc) # 2014-2017 Steven Armstrong (steven-cdist at armstrong.cc)
# 2014 Nico Schottelius (nico-cdist at schottelius.org) # 2014 Nico Schottelius (nico-cdist at schottelius.org)
# #
# This file is part of cdist. # This file is part of cdist.
@ -56,15 +56,13 @@ esac
# #
echo changed >> "$__messages_out" echo changed >> "$__messages_out"
if [ "$has_hostnamectl" ]; then # Use the good old way to set the hostname even on machines running systemd.
echo "hostnamectl set-hostname '$name_should'"
else
case "$os" in case "$os" in
archlinux|debian|ubuntu|devuan) archlinux|debian|ubuntu|devuan|centos)
echo "hostname '$name_should'"
echo "printf '%s\n' '$name_should' > /etc/hostname" echo "printf '%s\n' '$name_should' > /etc/hostname"
echo "hostname -F /etc/hostname"
;; ;;
centos|openbsd) openbsd)
echo "hostname '$name_should'" echo "hostname '$name_should'"
;; ;;
suse) suse)
@ -72,4 +70,9 @@ else
echo "printf '%s\n' '$name_should' > /etc/HOSTNAME" echo "printf '%s\n' '$name_should' > /etc/HOSTNAME"
;; ;;
esac esac
if [ "$has_hostnamectl" ]; then
# Allow hostnamectl set-hostname to fail silently.
# Who the fuck invented a tool that needs dbus to set the hostname anyway ...
echo "hostnamectl set-hostname '$name_should' || true"
fi fi