From 353bb9bc9a0ab3c6650d72d2ceb14c990762a2a0 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Tue, 23 Aug 2016 13:22:19 -0500 Subject: init.d/hostname: add support for /etc/hostname --- init.d/hostname.in | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'init.d/hostname.in') diff --git a/init.d/hostname.in b/init.d/hostname.in index 21ed7019..74866b4c 100644 --- a/init.d/hostname.in +++ b/init.d/hostname.in @@ -17,10 +17,16 @@ depend() { start() { - # HOSTNAME variable used to be defined in caps in conf.d/hostname. - # It is also a magic variable in bash. - hostname=${hostname-${HOSTNAME-localhost}} # checkbashisms: false positive - ebegin "Setting hostname to $hostname" - hostname "$hostname" + local h source x + if [ -s @SYSCONFDIR@/hostname ] && [ -r @SYSCONFDIR@/hostname ]; then + read h x <@SYSCONFDIR@/hostname + source=" from @SYSCONFDIR@/hostname" + else + # HOSTNAME variable used to be defined in caps in conf.d/hostname. + # It is also a magic variable in bash. + h=${hostname-${HOSTNAME-localhost}} # checkbashisms: false positive + fi + ebegin "Setting hostname to $h $source" + hostname "$h" eend $? "Failed to set the hostname" } -- cgit v1.2.3