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

Merge branch '__hostname_fix' into 'master'

Browse source 
__hostname: silence grep exit 1, when os_version is not numeric

See merge request ungleich-public/cdist!814
This commit is contained in:
poljakowski 2019-11-22 19:49:10 +01:00
commit cd8ffd9046
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@ set_hostname_systemd() {
os=$(cat "$__global/explorer/os") os=$(cat "$__global/explorer/os")
os_version=$(cat "$__global/explorer/os_version") os_version=$(cat "$__global/explorer/os_version")
os_major=$(echo "$os_version" | grep -o '^[0-9][0-9]*') os_major=$(echo "$os_version" | grep -o '^[0-9][0-9]*' || true)
max_len=$(cat "$__object/explorer/max_len") max_len=$(cat "$__object/explorer/max_len")
has_hostnamectl=$(cat "$__object/explorer/has_hostnamectl") has_hostnamectl=$(cat "$__object/explorer/has_hostnamectl")