use hostnamectl, if available, else use /etc/hostname and hostname
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
parent
8d5357107b
commit
b6bae508a8
4 changed files with 77 additions and 11 deletions
24
cdist/conf/type/__hostname/explorer/has_hostnamectl
Executable file
24
cdist/conf/type/__hostname/explorer/has_hostnamectl
Executable file
|
@ -0,0 +1,24 @@
|
||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# 2014 Nico Schottelius (nico-cdist at schottelius.org)
|
||||||
|
#
|
||||||
|
# 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/>.
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# Check whether system has hostnamectl
|
||||||
|
#
|
||||||
|
|
||||||
|
command -v hostnamectl || true
|
26
cdist/conf/type/__hostname/explorer/hostname_file
Executable file
26
cdist/conf/type/__hostname/explorer/hostname_file
Executable file
|
@ -0,0 +1,26 @@
|
||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# 2014 Nico Schottelius (nico-cdist at schottelius.org)
|
||||||
|
#
|
||||||
|
# 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/>.
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# Retrieve the contents of /etc/hostname
|
||||||
|
#
|
||||||
|
|
||||||
|
if [ -f /etc/hostname ]; then
|
||||||
|
cat /etc/hostname
|
||||||
|
fi
|
|
@ -20,20 +20,31 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
if [ -f "$__object/parameter/name" ]; then
|
if [ -f "$__object/parameter/name" ]; then
|
||||||
name="$(cat "$__object/parameter/name")"
|
name_should="$(cat "$__object/parameter/name")"
|
||||||
else
|
else
|
||||||
name="$(echo "${__target_host%%.*}")"
|
name_should="$(echo "${__target_host%%.*}")"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
os=$(cat "$__global/explorer/os")
|
os=$(cat "$__global/explorer/os")
|
||||||
|
name_running=$(cat "$__global/explorer/hostname")
|
||||||
|
name_config=$(cat "$__object/explorer/hostname_file")
|
||||||
|
has_hostnamectl=$(cat "$__object/explorer/has_hostnamectl")
|
||||||
|
|
||||||
echo "printf '%s\n' '$name' > /etc/hostname"
|
################################################################################
|
||||||
|
# If everything is ok -> exit
|
||||||
|
#
|
||||||
|
if [ "$name_config" = "$name_should" -a "$name_running" = "$name_should" ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
case "$os" in
|
################################################################################
|
||||||
debian|ubuntu)
|
# Setup hostname
|
||||||
echo "hostname \"$name\""
|
#
|
||||||
;;
|
echo changed >> "$__messages_out"
|
||||||
archlinux)
|
|
||||||
echo "hostnamectl set-hostname \"$name\""
|
if [ "$has_hostnamectl" ]; then
|
||||||
;;
|
echo "hostnamectl set-hostname '$name_should'"
|
||||||
esac
|
else
|
||||||
|
echo "hostname '$name_should'"
|
||||||
|
echo "printf '%s\n' '$name_should' > /etc/hostname"
|
||||||
|
fi
|
||||||
|
|
|
@ -24,6 +24,11 @@ name::
|
||||||
(${__target_host%%.*})
|
(${__target_host%%.*})
|
||||||
|
|
||||||
|
|
||||||
|
MESSAGES
|
||||||
|
--------
|
||||||
|
changed::
|
||||||
|
Changed the hostname
|
||||||
|
|
||||||
EXAMPLES
|
EXAMPLES
|
||||||
--------
|
--------
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue