X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=src%2Finitscripts%2Finit.d%2Ftmpfs;h=2ee2ffb72f783bbe223127b80a7dc548b24534ba;hp=41d6a1df96e7af51eab316c53f03963e9b23ad05;hb=601f8347ccb1e9c5e3f250ff26d4097ecd698875;hpb=9e44c671f9a45d7b1ec4f0d0ec25e3d131ba9f81

diff --git a/src/initscripts/init.d/tmpfs b/src/initscripts/init.d/tmpfs
index 41d6a1df96..2ee2ffb72f 100644
--- a/src/initscripts/init.d/tmpfs
+++ b/src/initscripts/init.d/tmpfs
@@ -43,10 +43,6 @@ case "$1" in
 			mkdir -p /var/run/mysql
 			chown mysql:mysql /var/run/mysql
 		fi
-		if [ ! -e /var/run/pluto ]; then
-			mkdir -p /var/run/pluto
-			chmod 700 /var/run/pluto
-		fi
 		if [ ! -e /var/run/saslauthd ]; then
 			mkdir -p /var/run/saslauthd
 		fi
@@ -72,6 +68,15 @@ case "$1" in
 		evaluate_retval
 		;;
 	restore)
+		if ! mountpoint $RRDLOG &>/dev/null; then
+			mount -t tmpfs -o size=64M none "$RRDLOG"
+		fi
+
+		if [ -e $RRDLOG.bak/cron/new.root ]; then
+			if [ -e $RRDLOG.bak/cron/root ]; then
+				rm -f $RRDLOG.bak/cron/new.root
+			fi
+		fi
 		if [ -e $RRDLOG.bak ];then
 			boot_mesg "Restore ramdisk..."
 			cp -pR $RRDLOG.bak/* $RRDLOG/