summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2013-07-04 17:23:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-10 09:42:00 +0100
commit5b4494950d125a24927382a4a20af1b9403f1eb6 (patch)
tree51fd3331a982808d2602fc4f7074a09ef9a0b0d8 /meta
parent6e08d01e54111a0ed01b088df32d894c59973c23 (diff)
downloadpoky-5b4494950d125a24927382a4a20af1b9403f1eb6.tar.gz
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 <mark.asselstine@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rwxr-xr-xmeta/recipes-core/initscripts/initscripts-1.0/hostname.sh12
1 files changed, 10 insertions, 2 deletions
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 @@
7# Default-Stop: 7# Default-Stop:
8# Short-Description: Set hostname based on /etc/hostname 8# Short-Description: Set hostname based on /etc/hostname
9### END INIT INFO 9### END INIT INFO
10HOSTNAME=$(/bin/hostname)
10 11
11if test -f /etc/hostname 12hostname -b -F /etc/hostname 2> /dev/null
12then 13if [ $? -eq 0 ]; then
14 exit
15fi
16
17# Busybox hostname doesn't support -b so we need implement it on our own
18if [ -f /etc/hostname ];then
13 hostname -F /etc/hostname 19 hostname -F /etc/hostname
20elif [ -z "$HOSTNAME" -o "$HOSTNAME" = "(none)" -o ! -z "`echo $HOSTNAME | sed -n '/^[0-9]*\.[0-9].*/p'`" ] ; then
21 hostname localhost
14fi 22fi