made /etc/profile changeable per machine

removed some uncommented lines
renamed populate-var into populate-var.sh (and all of it's symlinks), so that /etc/init.d/rcS will source it. This should be faster.
append numeric login possibility for MNCI "Ramses"
machine-specific issue files for MNCI "Ramses"
machine specific /etc/profile for MNCI "Ramses"

BKrev: 41500655xu_mUBx0XCOpn30Z3BXBRg

1 files changed, 20 insertions, 21 deletions

diff --git a/base-files/base-files_3.0.14.oe b/base-files/base-files_3.0.14.oe
index 3b4b00fc98..41c3e63146 100644
--- a/base-files/base-files_3.0.14.oe
+++ b/base-files/base-files_3.0.14.oe
@@ -1,14 +1,14 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r13"
+PR = "r14"
 
 SRC_URI = " \
            file://etc/nsswitch.conf \
            file://etc/motd \
            file://etc/inputrc \
            file://etc/host.conf \
-           file://etc/profile \
+           file://profile \
            file://fstab \
            file://issue.net \
            file://issue \
@@ -47,8 +47,6 @@ do_install () {
     install -m 644 debian/changelog debian/FAQ debian/README.FHS debian/README.base ${D}/${docdir}/
     cat ${S}/debian/copyright.in | sed -e "s&#OSNAME#&${TARGET_OS}&g" > ${D}/${docdir}/copyright
     install -m 755 debian/remove-base ${D}/${docdir}
-#   cd debian && install -m 755 preinst postinst ${D}/DEBIAN
-#   cd debian && install -m 644 conffiles ${D}/DEBIAN
     ( cd ${D} && install -d `cat ${S}/debian/directory-list` )
     install -d ${D}/sys
 
@@ -59,10 +57,6 @@ do_install () {
 
     cat share/info.dir | sed -e "s&#OSNAME#&${TARGET_OS}&g" > ${D}${datadir}/base-files/info.dir
     gzip -9 ${D}/${docdir}/changelog
-#   chown -R root:root ${D}
-#   cd ${D} && chown root:src     usr/src
-#   cd ${D} && chown root:staff   var/local
-#   cd ${D} && chown root:staff   home
     cd ${D} && chmod 755  `find . -type d`
     cd ${D} && chmod 1777 `cat ${S}/debian/1777-dirs`
     cd ${D} && chmod 2775 `cat ${S}/debian/2775-dirs`
@@ -71,7 +65,7 @@ do_install () {
     install -m 0644 ${WORKDIR}/fstab ${D}/${sysconfdir}/fstab
     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}/profile ${D}/${sysconfdir}/profile
     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
@@ -97,24 +91,23 @@ do_install () {
     if grep -q "^\(tmpfs\|ramfs\)\W\+/var" ${D}/etc/fstab; then
         # /var is in a ramdisk
         install -d ${D}/etc/init.d ${D}/etc/rcS.d
-	echo "#!/bin/sh" >> ${D}/etc/init.d/populate-var
-	
+
 	for d in `(cd ${D}/var; ls)`; do
 		mode=`stat -c %a ${D}/var/$d`
-		echo "mkdir -p /var/$d" >> ${D}/etc/init.d/populate-var
-		echo "chmod $mode /var/$d" >> ${D}/etc/init.d/populate-var
+		echo "mkdir -p /var/$d" >> ${D}/etc/init.d/populate-var.sh
+		echo "chmod $mode /var/$d" >> ${D}/etc/init.d/populate-var.sh
 	done
 	
-	echo "mkdir -p /var/lock/subsys" 		>> ${D}/etc/init.d/populate-var
-	echo "chmod 755 /var/lock/subsys" 		>> ${D}/etc/init.d/populate-var
-	echo "> /var/run/utmp" 				>> ${D}/etc/init.d/populate-var
-	echo "touch /var/log/wtmp" 			>> ${D}/etc/init.d/populate-var
-	echo "chmod 0664 /var/run/utmp /var/log/wtmp"	>> ${D}/etc/init.d/populate-var
-	echo "rm -f /var/run/utmpx"			>> ${D}/etc/init.d/populate-var
+	echo "mkdir -p /var/lock/subsys" 		>> ${D}/etc/init.d/populate-var.sh
+	echo "chmod 755 /var/lock/subsys" 		>> ${D}/etc/init.d/populate-var.sh
+	echo ">/var/run/utmp" 				>> ${D}/etc/init.d/populate-var.sh
+	echo "touch /var/log/wtmp" 			>> ${D}/etc/init.d/populate-var.sh
+	echo "chmod 0664 /var/run/utmp /var/log/wtmp"	>> ${D}/etc/init.d/populate-var.sh
+	echo "rm -f /var/run/utmpx"			>> ${D}/etc/init.d/populate-var.sh
 
         rmdir ${D}/var/*
-        chmod a+x ${D}/etc/init.d/populate-var
-        ln -s ../init.d/populate-var ${D}/etc/rcS.d/S37populate-var
+        chmod a+x ${D}/etc/init.d/populate-var.sh
+        ln -s ../init.d/populate-var.sh ${D}/etc/rcS.d/S37populate-var.sh
         ln -s /var/run/resolv.conf ${D}/etc/resolv.conf
         ln -s /var/run/ld.so.cache ${D}/etc/ld.so.cache
         ln -s /proc/mounts ${D}/etc/mtab
@@ -130,6 +123,12 @@ do_install () {
     install -m 0755 -d                              ${D}/mnt/ram
 }
 
+
+do_install_append_ramses () {
+    echo "MNCI" >${D}/${sysconfdir}/hostname
+}
+
+
 PACKAGES = "${PN}-doc ${PN}"
 FILES_${PN} = "/"
 FILES_${PN}-doc = "/usr/share/doc /usr/share/common-licenses"