From f17bcc46341db5ee91bb26389ccaebc68c49b97e Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 17 Apr 2019 10:01:25 +0800 Subject: base-files: move hostname operations out of issue file settings The function do_install_basefilesissue is meant to deal with /etc/issue* files and the following setting could actually be overridden. BASEFILESISSUEINSTALL ?= "do_install_basefilesissue" So move the hostname operations out of this function. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- meta/recipes-core/base-files/base-files_3.0.14.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta/recipes-core/base-files') 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 a1639db830..4b4027f18d 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -134,15 +134,16 @@ do_install () { install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd ln -sf /proc/mounts ${D}${sysconfdir}/mtab -} -DISTRO_VERSION[vardepsexclude] += "DATE" -do_install_basefilesissue () { + # deal with hostname if [ "${hostname}" ]; then echo ${hostname} > ${D}${sysconfdir}/hostname echo "127.0.1.1 ${hostname}" >> ${D}${sysconfdir}/hosts fi +} +DISTRO_VERSION[vardepsexclude] += "DATE" +do_install_basefilesissue () { install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir} if [ -n "${DISTRO_NAME}" ]; then printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue -- cgit 1.2.3-korg