From d220fa946a2f00974b1e9db9fb83ab8057836fee Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Sun, 6 Nov 2016 14:05:32 -0500 Subject: [PATCH] Reverse logic for clearing domain name --- CHANGELOG.md | 1 + actions/domainname-change | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db4d4b8f7..95b40a066 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file. - Include module static files in build, required for Debian package build. - dynamicdns: Allow reading status as non-root. - config: Set current domainname again after hostname change. +- config: Handle clearing of domain name. ### Changed - repro: Use firewalld provided SIP services. diff --git a/actions/domainname-change b/actions/domainname-change index 0f4c33e02..f754fd363 100755 --- a/actions/domainname-change +++ b/actions/domainname-change @@ -18,8 +18,8 @@ domainname="$1" hostname=$(hostname) - -if [ -n "$domainname"] ; then + +if [ -z "$domainname" ] ; then if grep -q 127.0.1.1 /etc/hosts ; then sed -i "s/127.0.1.1.*/127.0.1.1 $hostname/" /etc/hosts else @@ -33,4 +33,4 @@ else sed -i "/127.0.0.1.*/a \ 127.0.1.1 $hostname.$domainname $hostname" /etc/hosts fi -fi \ No newline at end of file +fi