From d2b31440708bd0cb70e5317e05b8ae80e4866269 Mon Sep 17 00:00:00 2001
From: William Hubbs <w.d.hubbs@gmail.com>
Date: Wed, 8 Jun 2022 13:37:53 -0500
Subject: clean up hostname service script

- use _ throw-away variable to get rid of a shellcheck warning
- remove tests for /etc/hostname and just try to read it
- drop reference to bash HOSTNAME variable.
- make source of host name more accurate

X-Gentoo-Bug: 850577
X-Gentoo-Bug-URL: https://bugs.gentoo.org/850577
---
 init.d/hostname.in | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/init.d/hostname.in b/init.d/hostname.in
index 5d597ad5..3d70a2f3 100644
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -19,20 +19,18 @@ depend()
 
 start()
 {
-	local h source x
-	if [ -s /etc/hostname ] && [ -r /etc/hostname ]; then
-		read h x </etc/hostname
-		source="from /etc/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}} # checkbashisms: false positive (HOSTNAME var)
+	local h source
+	if read -r h _ 2> /dev/null < @SYSCONFDIR@/hostname; then
+		source="@SYSCONFDIR@/hostname"
+	elif [ -n "${hostname}" ]; then
+		h=${hostname}
+		source="@SYSCONFDIR@/conf.d/${RC_SVCNAME}"
 	fi
 	if [ -z "$h" ]; then
 		einfo "Using default system hostname"
 		return 0
 	fi
-	ebegin "Setting hostname to $h $source"
+	ebegin "Setting hostname to $h from $source"
 	hostname "$h"
 	eend $? "Failed to set the hostname"
 }
-- 
cgit v1.2.3