From: Chris Larson <clarson@kergoth.com>
Date: Wed, 8 Sep 2004 22:43:38 +0000 (+0000)
Subject: Merge
X-Git-Tag: Release-2010-05/1~17325
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f89807629eb795dba66e835a97b17dd3110bfbea;p=openembedded.git

Merge

2004/09/08 17:34:05-05:00 handhelds.org!kergoth
Fix up handling of issue/issue.net in base-files, and include more sane
default ones for when DISTRO specific versions aren't available, or DISTRO
isn't set.

BKrev: 413f8b1aboaouXIY349Df2RAMtFt0g
---

diff --git a/base-files/base-files/etc/issue.net-openzaurus b/base-files/base-files/etc/issue.net-openzaurus
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/base-files/base-files/etc/issue.net-ramses b/base-files/base-files/etc/issue.net-ramses
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/base-files/base-files/etc/issue- b/base-files/base-files/familiar/issue
similarity index 100%
rename from base-files/base-files/etc/issue-
rename to base-files/base-files/familiar/issue
diff --git a/base-files/base-files/etc/issue-familiar b/base-files/base-files/familiar/issue.net
similarity index 100%
rename from base-files/base-files/etc/issue-familiar
rename to base-files/base-files/familiar/issue.net
diff --git a/base-files/base-files/etc/issue-opensimpad b/base-files/base-files/issue
similarity index 100%
rename from base-files/base-files/etc/issue-opensimpad
rename to base-files/base-files/issue
diff --git a/base-files/base-files/etc/issue-openzaurus b/base-files/base-files/issue.net
similarity index 100%
rename from base-files/base-files/etc/issue-openzaurus
rename to base-files/base-files/issue.net
diff --git a/base-files/base-files/etc/issue-ramses b/base-files/base-files/opensimpad/issue
similarity index 100%
rename from base-files/base-files/etc/issue-ramses
rename to base-files/base-files/opensimpad/issue
diff --git a/base-files/base-files/etc/issue.net- b/base-files/base-files/opensimpad/issue.net
similarity index 100%
rename from base-files/base-files/etc/issue.net-
rename to base-files/base-files/opensimpad/issue.net
diff --git a/base-files/base-files/etc/issue.net-familiar b/base-files/base-files/openzaurus/issue
similarity index 100%
rename from base-files/base-files/etc/issue.net-familiar
rename to base-files/base-files/openzaurus/issue
diff --git a/base-files/base-files/etc/issue.net-opensimpad b/base-files/base-files/openzaurus/issue.net
similarity index 100%
rename from base-files/base-files/etc/issue.net-opensimpad
rename to base-files/base-files/openzaurus/issue.net
diff --git a/base-files/base-files_3.0.14.oe b/base-files/base-files_3.0.14.oe
index 5035d80430..3b4b00fc98 100644
--- a/base-files/base-files_3.0.14.oe
+++ b/base-files/base-files_3.0.14.oe
@@ -6,18 +6,12 @@ PR = "r13"
 SRC_URI = " \
            file://etc/nsswitch.conf \
            file://etc/motd \
-           file://etc/issue.net- \
-           file://etc/issue-opensimpad \
-           file://etc/issue.net-opensimpad \
-           file://etc/issue- \
-           file://etc/issue-openzaurus \
-           file://etc/issue.net-openzaurus \
-           file://etc/issue-familiar \
-           file://etc/issue.net-familiar \
            file://etc/inputrc \
            file://etc/host.conf \
            file://etc/profile \
            file://fstab \
+           file://issue.net \
+           file://issue \
            file://usbd \
            file://share/dot.bashrc \
            file://share/dot.profile \
@@ -78,8 +72,8 @@ do_install () {
     install -m 0644 ${WORKDIR}/usbd ${D}/${sysconfdir}/default/usbd
     [ -z "${MACHINE}" ] && echo "openembedded" >${D}/${sysconfdir}/hostname || echo ${MACHINE} >${D}/${sysconfdir}/hostname
     install -m 0644 ${WORKDIR}/etc/profile ${D}/${sysconfdir}/profile
-    install -m 0644 ${WORKDIR}/etc/issue-${DISTRO} ${D}/${sysconfdir}/issue
-    install -m 0644 ${WORKDIR}/etc/issue.net-${DISTRO} ${D}/${sysconfdir}/issue.net
+    install -m 0644 ${WORKDIR}/issue ${D}/${sysconfdir}/issue
+    install -m 0644 ${WORKDIR}/issue.net ${D}/${sysconfdir}/issue.net
     cat ${WORKDIR}/etc/motd | sed -e "s&#OSNAME#&${TARGET_OS}&g" > ${D}${datadir}/base-files/motd
     for f in inputrc nsswitch.conf host.conf
     do