Skip to contentSkip to conversation

initscripts: overwrite default hostname.sh

PATCH New [email protected] 1 participant 2 messages Jul 4, 2013

lore
Share & tools
lore
#0 lore raw

cover initscripts: overwrite default hostname.sh

From: Jackie Huang <[email protected]>

The following changes since commit 3e1dbabbf33a2e461abc92ff10cd970fe604ee38:

sysstat: backport a patch to fix a parallel building error (2013-07-02 07:58:10 -0700)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib jhuang0/r_bbappend_udev-initscripts_0704
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/r_bbappend_udev-initscripts_0704

Jackie Huang (1):
initscripts: overwrite default hostname.sh

 .../initscripts/initscripts-1.0/hostname.sh        |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 1/1 initscripts: overwrite default hostname.sh

From: Jackie Huang <[email protected]>

/etc/init.d/hostname.sh does not have a graceful fallback if the /etc/hostname file doesn't exist. Other systems such as Ubuntu and RH will either leave the hostname in place, if a proper hostname is already set, otherwise it will set the hostname to 'localhost' when the /etc/hostname files doesn't exist.

As you can see we have to add some additional handling to provide this behavior when the system's hostname command doesn't take the '-b' option.

---
 .../initscripts/initscripts-1.0/hostname.sh        |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
meta/recipes-core/initscripts/initscripts-1.0/hostname.sh +10 -2
index fb58c9c..78fb91c 100755
@@ -7,8 +7,16 @@
 # Default-Stop:
 # Short-Description: Set hostname based on /etc/hostname
 ### END INIT INFO
+HOSTNAME=$(/bin/hostname)
 
-if test -f /etc/hostname
-then
+hostname -b -F /etc/hostname 2> /dev/null
+if [ $? -eq 0 ]; then
+	exit
+fi
+
+# Busybox hostname doesn't support -b so we need implement it on our own
+if [ -f /etc/hostname ];then
 	hostname -F /etc/hostname
+elif [ -z "$HOSTNAME" -o "$HOSTNAME" = "(none)" -o ! -z "`echo $HOSTNAME | sed -n '/^[0-9]*\.[0-9].*/p'`" ] ; then
+	hostname localhost
 fi
Signature · 1 line
1.7.4.1