Changed to use populate-volatile.sh.

2 files changed, 9 insertions, 41 deletions

diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index ee691a9560..cb648f2448 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r35"
+PR = "r36"
 LICENSE = "GPL"
 
 SRC_URI = " \
@@ -103,41 +103,6 @@ do_install () {
 		install -m 0644 ${WORKDIR}/licenses/$license ${D}${datadir}/common-licenses/
 	done
 
-	if (grep -q "^\(tmpfs\|ramfs\)\W\+/var" ${D}${sysconfdir}/fstab); then
-		# /var is in a ramdisk
-		install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/rcS.d
-		for d in ${dirs755}; do
-			if (echo $d|grep -q "^${localstatedir}"); then
-				echo "mkdir -p $d" >> ${D}${sysconfdir}/init.d/populate-var.sh
-				echo "chmod 0775 $d" >> ${D}${sysconfdir}/init.d/populate-var.sh
-			fi
-		done
-		for d in ${dirs1777}; do
-			if (echo $d|grep -q "^${localstatedir}"); then
-				echo "mkdir -p $d" >> ${D}${sysconfdir}/init.d/populate-var.sh
-				echo "chmod 1777 $d" >> ${D}${sysconfdir}/init.d/populate-var.sh
-			fi
-		done
-		for d in ${dirs2775}; do
-			if (echo $d|grep -q "^${localstatedir}"); then
-				echo "mkdir -p $d" >> ${D}${sysconfdir}/init.d/populate-var.sh
-				echo "chmod 2775 $d" >> ${D}${sysconfdir}/init.d/populate-var.sh
-			fi
-		done
-
-
-		echo ">/var/run/utmp" >> ${D}${sysconfdir}/init.d/populate-var.sh
-		echo ">/var/log/wtmp" >> ${D}${sysconfdir}/init.d/populate-var.sh
-		echo ">/var/log/lastlog" >> ${D}${sysconfdir}/init.d/populate-var.sh
-		echo "chmod 0664 /var/run/utmp /var/log/wtmp /var/log/lastlog"	>> ${D}${sysconfdir}/init.d/populate-var.sh
-		echo "touch /var/run/resolv.conf"	>> ${D}${sysconfdir}/init.d/populate-var.sh
-
-#		rmdir ${D}${localstatedir}/*
-		chmod 0755 ${D}${sysconfdir}/init.d/populate-var.sh
-		ln -sf ../init.d/populate-var.sh ${D}${sysconfdir}/rcS.d/S37populate-var.sh
-		ln -sf ${localstatedir}/run/resolv.conf ${D}${sysconfdir}/resolv.conf
-		ln -sf ${localstatedir}/ld.so.cache ${D}${sysconfdir}/ld.so.cache
-	fi
 	ln -sf /proc/mounts ${D}${sysconfdir}/mtab
 }
 
@@ -149,8 +114,7 @@ do_install_append_mnci () {
 }
 
 do_install_append_nylon() {
-	rm ${D}${sysconfdir}/resolv.conf
-	touch ${D}${sysconfdir}/resolv.conf
+	printf "" "" >${D}${sysconfdir}/resolv.conf
 	rm -r ${D}/mnt/*
 	rm -r ${D}/media
 	rm -rf ${D}/tmp
@@ -158,8 +122,7 @@ do_install_append_nylon() {
 }
 
 do_install_append_openslug() {
-	rm ${D}${sysconfdir}/resolv.conf
-	touch ${D}${sysconfdir}/resolv.conf
+	printf "" "" >${D}${sysconfdir}/resolv.conf
 	rm -r ${D}/mnt/*
 }
 
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