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

[__hostname/explorer/hostname] Darwin: Always fall back to hostname if scutil is missing or fails

Browse source
This commit is contained in:
Dennis Camera 2019-09-30 12:52:43 +02:00
parent 2804a8bae6
commit abc765bd99
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cdist/conf/type/__hostname/explorer/hostname
View file

@ -41,8 +41,8 @@ elif [ -f /etc/myname ]; then
elif [ "$(uname -s)" == FreeBSD ]; then elif [ "$(uname -s)" == FreeBSD ]; then
(. /etc/rc.conf && echo $hostname) (. /etc/rc.conf && echo $hostname)
# Mac OS X # Mac OS X
elif [ "$(uname -s)" == Darwin -a -x "$(command -v scutil)" ]; then elif [ "$(uname -s)" == Darwin ]; then
scutil --get HostName 2>/dev/null || hostname -s [ -x "$(command -v scutil)" ] && scutil --get HostName 2>/dev/null || hostname -s
else else
command -v hostname && hostname -s command -v hostname && hostname -s
fi fi