base-files: Allow a basic issue file to be extended by the code, following the method...

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/recipes-core/base-files/base-files/issue b/meta/recipes-core/base-files/base-files/issue
index 329af4665e828b61a52913a73344f075b431b3de..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/meta/recipes-core/base-files/base-files/issue
+++ b/meta/recipes-core/base-files/base-files/issue
@@ -1,2 +0,0 @@
-OpenEmbedded Linux \n \l
-

diff --git a/meta/recipes-core/base-files/base-files/issue.net b/meta/recipes-core/base-files/base-files/issue.net
index 6dc3588b4f25652573928cd8d8f3c69ae49e8251..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/meta/recipes-core/base-files/base-files/issue.net
+++ b/meta/recipes-core/base-files/base-files/issue.net
@@ -1,3 +0,0 @@
-OpenEmbedded Linux %h
-
-

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 aad3d8352b2d0d8ebe4aebf78a01030f0e8c6ee0..56a48fb3decec84b60b51e83d724d898b6a0c2e3 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
@@ -116,9 +116,10 @@ do_install_basefilesissue () {
                echo ${hostname} > ${D}${sysconfdir}/hostname
        fi
 
+       install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}  
         if [ -n "${DISTRO_NAME}" ]; then
-               echo -n "${DISTRO_NAME} " > ${D}${sysconfdir}/issue
-               echo -n "${DISTRO_NAME} " > ${D}${sysconfdir}/issue.net
+               echo -n "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue
+               echo -n "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net
                if [ -n "${DISTRO_VERSION}" ]; then
                        echo -n "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue
                        echo -n "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue.net
@@ -127,9 +128,6 @@ do_install_basefilesissue () {
                echo >> ${D}${sysconfdir}/issue
                echo "%h"    >> ${D}${sysconfdir}/issue.net
                echo >> ${D}${sysconfdir}/issue.net
-       else
-              install -m 0644 ${WORKDIR}/issue ${D}${sysconfdir}/issue
-              install -m 0644 ${WORKDIR}/issue.net ${D}${sysconfdir}/issue.net
        fi
 }