sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

base-files: clean up and clarify hostname logic 

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

(From OE-Core rev: f2588c55fb089371f239dde39efe9d63d8614062)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2015-02-23 17:39:24 +00:00 committed by Richard Purdie
parent 54567379ac
commit 0e04c93bae
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
meta/recipes-core/base-files/base-files_3.0.14.bb
View File

@ -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