From: Richard Tollerton Date: Thu, 17 Jul 2014 21:56:56 +0000 (-0500) Subject: initscripts: make hostname.sh coreutils-compatible X-Git-Tag: 2015-4~2278 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=acb8674e498468088d867ffae9a458caa08d95d5;p=openembedded-core.git initscripts: make hostname.sh coreutils-compatible inetutils and busybox hostname utils support `hostname -F`; coreutils hostname doesn't. So just use `cat` instead. Signed-off-by: Richard Tollerton Signed-off-by: Ben Shelton Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh b/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh index 78fb91c409..95287cc139 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh @@ -16,7 +16,7 @@ fi # Busybox hostname doesn't support -b so we need implement it on our own if [ -f /etc/hostname ];then - hostname -F /etc/hostname + hostname `cat /etc/hostname` elif [ -z "$HOSTNAME" -o "$HOSTNAME" = "(none)" -o ! -z "`echo $HOSTNAME | sed -n '/^[0-9]*\.[0-9].*/p'`" ] ; then hostname localhost fi