From 702f3eba4f8f88b634a010b377d077d501a6f0e9 Mon Sep 17 00:00:00 2001 From: Dennis Camera Date: Wed, 11 Nov 2020 14:15:02 +0100 Subject: [PATCH] [type/__hostname] Remove opensuse-leap OS string MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit everything should be suse now… --- cdist/conf/type/__hostname/gencode-remote | 2 +- cdist/conf/type/__hostname/manifest | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cdist/conf/type/__hostname/gencode-remote b/cdist/conf/type/__hostname/gencode-remote index 9447daa9..c1a97ac8 100755 --- a/cdist/conf/type/__hostname/gencode-remote +++ b/cdist/conf/type/__hostname/gencode-remote @@ -79,7 +79,7 @@ in (solaris) echo "uname -S '${name_should}'" ;; - (slackware|suse|opensuse-leap) + (slackware|suse) # We do not read from /etc/HOSTNAME, because the running # hostname is the first component only while the file contains # the FQDN. diff --git a/cdist/conf/type/__hostname/manifest b/cdist/conf/type/__hostname/manifest index 125bb2fb..d044072b 100755 --- a/cdist/conf/type/__hostname/manifest +++ b/cdist/conf/type/__hostname/manifest @@ -42,7 +42,7 @@ else # Hostname is FQDN name_should=${__target_host:?} ;; - (suse|opensuse-leap) + (suse) name_should=${__target_host:?} # Classic SuSE stores the FQDN in /etc/HOSTNAME, while @@ -157,7 +157,7 @@ in (solaris) echo "${name_should}" | __file /etc/nodename --source - ;; - (suse|opensuse-leap) + (suse) # Modern SuSE provides /etc/HOSTNAME as a symlink for # backwards-compatibility. Unfortunately it cannot be used # here as __file does not follow the symlink.