initscripts: overwrite default hostname.sh

/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.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

diff --git a/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh b/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh
index fb58c9c6345092bd55691c6d74476f07c1929ef2..78fb91c409aeac9376418c68322cf86cf64dc4ea 100755 (executable)
--- a/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh
@@ -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