base-files: clean up and clarify hostname logic

Change the hostname logic the default value is ${MACHINE}, and explain how to
change it.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 6157ff381a0316a3f231ca1f288a2807f3e17560..f2d254e6bdf637f1d301c811471e3c8ad9d5f7a8 100644 (file)
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -59,10 +59,13 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
              ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \
              ${sysconfdir}/default"
 
+# By default the hostname is the machine name. If the hostname is unset then a
+# /etc/hostname file isn't written, suitable for environments with dynamic
+# hostnames.
 #
-# set standard hostname, might be a candidate for a DISTRO variable? :M:
-#
-hostname = "openembedded"
+# The hostname can be changed outside of this recipe by using
+# hostname_pn-base-files = "my-host-name".
+hostname = "${MACHINE}"
 
 BASEFILESISSUEINSTALL ?= "do_install_basefilesissue"
 
@@ -111,15 +114,11 @@ do_install () {
 
 DISTRO_VERSION[vardepsexclude] += "DATE"
 do_install_basefilesissue () {
-       if [ "${hostname}" != "" ]; then
-               if [ -n "${MACHINE}" -a "${hostname}" = "openembedded" ]; then
-                       echo ${MACHINE} > ${D}${sysconfdir}/hostname
-               else
-                       echo ${hostname} > ${D}${sysconfdir}/hostname
-               fi
+       if [ "${hostname}" ]; then
+               echo ${hostname} > ${D}${sysconfdir}/hostname
        fi
 
-       install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}  
+       install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}
         if [ -n "${DISTRO_NAME}" ]; then
                printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue
                printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net