propagate from branch 'org.openembedded.dev' (head 50712da157ce819a41034d91e842f659f060e42e)

            to branch 'org.openembedded.nslu2-linux' (head b810c89693fd745a4fd808082ffac3a03e1223c4)

3 files changed, 99 insertions, 1 deletions

diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh
new file mode 100755
index 0000000000..311a2764da
--- /dev/null
+++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+. /etc/default/rcS
+CFGFILE="/etc/default/volatiles"
+
+[ "${VERBOSE}" != "no" ] && echo "Populating volatile Filesystems."
+
+cat ${CFGFILE} | grep -v "^#" |   \
+while read LINE; do
+  TTYPE=`echo ${LINE} | cut -d " " -f 1`
+  TUSER=`echo ${LINE} | cut -d " " -f 2`
+  TGROUP=`echo ${LINE} | cut -d " " -f 3`
+  TMODE=`echo ${LINE} | cut -d " " -f 4`
+  TNAME=`echo ${LINE} | cut -d " " -f 5`
+
+  [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-."
+
+  [ "${TTYPE}" = "l" ] && {
+    [ -e "${TNAME}" ] && {
+      echo "Cannot create link over existing -${TNAME}-." >&2
+      } || {
+      TSOURCE=`echo ${LINE} | cut -d " " -f 6`
+      [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-."
+      ln -s "${TSOURCE}" "${TNAME}"
+      }
+    continue
+    }
+
+  [ -L "${TNAME}" ] && {
+    [ "${VERBOSE}" != "no" ] && echo "Found link."
+    NEWNAME=`ls -l "${TNAME}" | sed -e 's/^.*-> \(.*\)$/\1/'`
+    echo ${NEWNAME} | grep -v "^/" >/dev/null && {
+      TNAME="`echo ${TNAME} | sed -e 's@\(.*\)/.*@\1@'`/${NEWNAME}"
+      [ "${VERBOSE}" != "no" ] && echo "Converted relative linktarget to absolute path -${TNAME}-."
+      } || {
+      TNAME="${NEWNAME}"
+      [ "${VERBOSE}" != "no" ] && echo "Using absolute link target -${TNAME}-."
+      }
+    }
+
+  [ -e "${TNAME}" ] && {
+    [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
+    continue
+    }
+
+  case "${TTYPE}" in
+    "f")  [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-."
+          touch "${TNAME}"
+	  ;;
+    "d")  [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-."
+          mkdir -p "${TNAME}"
+	  # Add check to see if there's an entry in fstab to mount.
+	  ;;
+    *)    [ "${VERBOSE}" != "no" ] && echo "Invalid type -${TTYPE}-."
+          continue
+	  ;;
+  esac
+
+  chown ${TUSER} ${TNAME} || echo "Failed to set owner -${TUSER}- for -${TNAME}-." >&2
+  chgrp ${TGROUP} ${TNAME} || echo "Failed to set group -${TGROUP}- for -${TNAME}-." >&2
+  chmod ${TMODE} ${TNAME} || echo "Failed to set mode -${TMODE}- for -${TNAME}-." >&2
+
+  done
+
diff --git a/packages/initscripts/initscripts-1.0/volatiles b/packages/initscripts/initscripts-1.0/volatiles
new file mode 100644
index 0000000000..45d373cedc
--- /dev/null
+++ b/packages/initscripts/initscripts-1.0/volatiles
@@ -0,0 +1,29 @@
+# This configuration file lists filesystem objects that should get verified
+# during startup and be created if missing.
+#
+# Every line must either be a comment starting with #
+# or a definition of format:
+# <type> <owner> <group> <mode> <path> [<linksource>]
+# where the items are separated by whitespace !
+#
+# <type> : d|f|l : (d)irectory|(f)ile|(l)ink
+#
+# A linking example:
+# l root root 0777 /var/test /tmp/testfile
+# f root root 0644 /var/test
+#
+d root root 0775 /var
+d root root 0755 /var/backups
+d root root 0755 /var/cache
+d root root 0755 /var/lib
+d root root 0755 /var/lib/misc
+d root root 2775 /var/local
+d root root 1777 /var/lock
+d root root 0755 /var/lock/subsys
+d root root 0755 /var/log
+d root root 0755 /var/run
+d root root 0755 /var/spool
+d root root 1777 /var/tmp
+f root root 0664 /var/run/utmp
+f root root 0664 /var/log/wtmp
+f root root 0664 /var/log/lastlog
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 8c735b7a5e..3fbbda4cf8 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r47"
+PR = "r48"
 
 SRC_URI = "file://halt \
            file://ramdisk \
@@ -30,6 +30,8 @@ SRC_URI = "file://halt \
            file://umountnfs.sh \
            file://sysfs.sh \
            file://device_table.txt \
+	   file://populate-volatile.sh \
+	   file://volatiles \
            file://corgikeymap-2.6.map \
            file://tosakeymap-2.6.map"
 
@@ -82,6 +84,8 @@ do_install () {
 	install -m 0755    ${WORKDIR}/devpts.sh	${D}${sysconfdir}/init.d
 	install -m 0755    ${WORKDIR}/devpts		${D}${sysconfdir}/default
 	install -m 0755    ${WORKDIR}/sysfs.sh		${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d
+	install -m 0644    ${WORKDIR}/volatiles		${D}${sysconfdir}/default
 	if [ "${TARGET_ARCH}" = "arm" ]; then
 		install -m 0755 ${WORKDIR}/alignment.sh	${D}${sysconfdir}/init.d
 	fi
@@ -140,6 +144,7 @@ do_install () {
 	ln -sf		../init.d/devices	${D}${sysconfdir}/rcS.d/S05devices
 	# udev will run at S04 if installed
 	ln -sf		../init.d/sysfs.sh	${D}${sysconfdir}/rcS.d/S03sysfs
+	ln -sf		../init.d/populate-volatile.sh	${D}${sysconfdir}/rcS.d/S37populate-volatile.sh
 	ln -sf		../init.d/devpts.sh	${D}${sysconfdir}/rcS.d/S38devpts.sh
 	if [ "${TARGET_ARCH}" = "arm" ]; then
 		ln -sf	../init.d/alignment.sh	${D}${sysconfdir}/rcS.d/S06alignment