From 5b4494950d125a24927382a4a20af1b9403f1eb6 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Thu, 4 Jul 2013 17:23:11 +0800 Subject: 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. (From OE-Core rev: 09e59f1dad9fb52adb1717840837e42a36a6c7a1) Signed-off-by: Mark Asselstine Signed-off-by: Jackie Huang Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/initscripts/initscripts-1.0/hostname.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/initscripts/initscripts-1.0') diff --git a/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh b/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh index fb58c9c634..78fb91c409 100755 --- 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 -- cgit v1.2.3-54-g00ecf