From f89807629eb795dba66e835a97b17dd3110bfbea Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 8 Sep 2004 22:43:38 +0000 Subject: 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 --- base-files/base-files/etc/issue- | 0 base-files/base-files/etc/issue-familiar | 0 base-files/base-files/etc/issue-opensimpad | 0 base-files/base-files/etc/issue-openzaurus | 0 base-files/base-files/etc/issue-ramses | 0 base-files/base-files/etc/issue.net- | 0 base-files/base-files/etc/issue.net-familiar | 0 base-files/base-files/etc/issue.net-opensimpad | 0 base-files/base-files/etc/issue.net-openzaurus | 0 base-files/base-files/etc/issue.net-ramses | 0 base-files/base-files/familiar/issue | 0 base-files/base-files/familiar/issue.net | 0 base-files/base-files/issue | 0 base-files/base-files/issue.net | 0 base-files/base-files/opensimpad/issue | 0 base-files/base-files/opensimpad/issue.net | 0 base-files/base-files/openzaurus/issue | 0 base-files/base-files/openzaurus/issue.net | 0 base-files/base-files_3.0.14.oe | 14 ++++---------- 19 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 base-files/base-files/etc/issue- delete mode 100644 base-files/base-files/etc/issue-familiar delete mode 100644 base-files/base-files/etc/issue-opensimpad delete mode 100644 base-files/base-files/etc/issue-openzaurus delete mode 100644 base-files/base-files/etc/issue-ramses delete mode 100644 base-files/base-files/etc/issue.net- delete mode 100644 base-files/base-files/etc/issue.net-familiar delete mode 100644 base-files/base-files/etc/issue.net-opensimpad delete mode 100644 base-files/base-files/etc/issue.net-openzaurus delete mode 100644 base-files/base-files/etc/issue.net-ramses create mode 100644 base-files/base-files/familiar/issue create mode 100644 base-files/base-files/familiar/issue.net create mode 100644 base-files/base-files/issue create mode 100644 base-files/base-files/issue.net create mode 100644 base-files/base-files/opensimpad/issue create mode 100644 base-files/base-files/opensimpad/issue.net create mode 100644 base-files/base-files/openzaurus/issue create mode 100644 base-files/base-files/openzaurus/issue.net diff --git a/base-files/base-files/etc/issue- b/base-files/base-files/etc/issue- deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/base-files/base-files/etc/issue-familiar b/base-files/base-files/etc/issue-familiar deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/base-files/base-files/etc/issue-opensimpad b/base-files/base-files/etc/issue-opensimpad deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/base-files/base-files/etc/issue-openzaurus b/base-files/base-files/etc/issue-openzaurus deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/base-files/base-files/etc/issue-ramses b/base-files/base-files/etc/issue-ramses deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/base-files/base-files/etc/issue.net- b/base-files/base-files/etc/issue.net- deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/base-files/base-files/etc/issue.net-familiar b/base-files/base-files/etc/issue.net-familiar deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/base-files/base-files/etc/issue.net-opensimpad b/base-files/base-files/etc/issue.net-opensimpad deleted file mode 100644 index e69de29bb2..0000000000 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/familiar/issue b/base-files/base-files/familiar/issue new file mode 100644 index 0000000000..e69de29bb2 diff --git a/base-files/base-files/familiar/issue.net b/base-files/base-files/familiar/issue.net new file mode 100644 index 0000000000..e69de29bb2 diff --git a/base-files/base-files/issue b/base-files/base-files/issue new file mode 100644 index 0000000000..e69de29bb2 diff --git a/base-files/base-files/issue.net b/base-files/base-files/issue.net new file mode 100644 index 0000000000..e69de29bb2 diff --git a/base-files/base-files/opensimpad/issue b/base-files/base-files/opensimpad/issue new file mode 100644 index 0000000000..e69de29bb2 diff --git a/base-files/base-files/opensimpad/issue.net b/base-files/base-files/opensimpad/issue.net new file mode 100644 index 0000000000..e69de29bb2 diff --git a/base-files/base-files/openzaurus/issue b/base-files/base-files/openzaurus/issue new file mode 100644 index 0000000000..e69de29bb2 diff --git a/base-files/base-files/openzaurus/issue.net b/base-files/base-files/openzaurus/issue.net new file mode 100644 index 0000000000..e69de29bb2 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 -- cgit v1.2.3