[gentoo-commits] proj/openrc:master commit in: init.d/

[William Hubbs]

commit:     353bb9bc9a0ab3c6650d72d2ceb14c990762a2a0
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Aug 23 18:22:19 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 18:22:19 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=353bb9bc

init.d/hostname: add support for /etc/hostname

 init.d/hostname.in | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/init.d/hostname.in b/init.d/hostname.in
index 21ed701..74866b4 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"
 }