[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 95b87f39ac309eb352dca6adbccfcff631bfe914

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 1759 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  95b87f39ac309eb352dca6adbccfcff631bfe914 (commit)
      from  702f0ba8357aa11ccee4cf7c43efd5d8f362a343 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 95b87f39ac309eb352dca6adbccfcff631bfe914
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Aug 22 13:36:23 2018 +0100

    localnet: Set FQDN without using domainname command
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 src/initscripts/system/localnet | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

Difference in files:
diff --git a/src/initscripts/system/localnet b/src/initscripts/system/localnet
index 97f4d381c..a16b32e46 100644
--- a/src/initscripts/system/localnet
+++ b/src/initscripts/system/localnet
@@ -36,16 +36,10 @@ case "${1}" in
 		ip link set lo up
 		evaluate_retval
 
-		boot_mesg "Setting hostname to ${HOSTNAME}..."
-		hostname "${HOSTNAME}"
+		boot_mesg "Setting hostname to ${HOSTNAME}.${DOMAINNAME}..."
+		hostname "${HOSTNAME}.${DOMAINNAME}"
 		evaluate_retval
 
-		if [ -n "${DOMAINNAME}" ]; then
-			boot_mesg "Setting domainname to ${DOMAINNAME}..."
-			domainname "${DOMAINNAME}"
-			evaluate_retval
-		fi
-
 		# Update hosts
 		write_hosts
 


hooks/post-receive
--
IPFire 2.x development tree