matthijs/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

[type/__hostname] Remove opensuse-leap OS string

Browse source 
everything should be suse now…
This commit is contained in:
Dennis Camera 2020-11-11 14:15:02 +01:00
parent 3e48ef9e11
commit 702f3eba4f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -79,7 +79,7 @@ in
(solaris) (solaris)
echo "uname -S '${name_should}'" echo "uname -S '${name_should}'"
;; ;;
(slackware|suse|opensuse-leap) (slackware|suse)
# We do not read from /etc/HOSTNAME, because the running # We do not read from /etc/HOSTNAME, because the running
# hostname is the first component only while the file contains # hostname is the first component only while the file contains
# the FQDN. # the FQDN.

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

@ -42,7 +42,7 @@ else
# Hostname is FQDN # Hostname is FQDN
name_should=${__target_host:?} name_should=${__target_host:?}
;; ;;
(suse|opensuse-leap) (suse)
name_should=${__target_host:?} name_should=${__target_host:?}
# Classic SuSE stores the FQDN in /etc/HOSTNAME, while # Classic SuSE stores the FQDN in /etc/HOSTNAME, while
@ -157,7 +157,7 @@ in
(solaris) (solaris)
echo "${name_should}" | __file /etc/nodename --source - echo "${name_should}" | __file /etc/nodename --source -
;; ;;
(suse|opensuse-leap) (suse)
# Modern SuSE provides /etc/HOSTNAME as a symlink for # Modern SuSE provides /etc/HOSTNAME as a symlink for
# backwards-compatibility. Unfortunately it cannot be used # backwards-compatibility. Unfortunately it cannot be used
# here as __file does not follow the symlink. # here as __file does not follow the symlink.