X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Finitscripts%2Finit.d%2Ftmpfs;h=2ee2ffb72f783bbe223127b80a7dc548b24534ba;hb=345124fb3dee5d1a1e929227512e1708ff637cd5;hp=cb60bcd08b5ab880333426d7a70817337e57bc87;hpb=dd7d74eb65b96a3fe0a664cf14b7185a10c6f7f2;p=ipfire-2.x.git

diff --git a/src/initscripts/init.d/tmpfs b/src/initscripts/init.d/tmpfs
index cb60bcd08b..2ee2ffb72f 100644
--- a/src/initscripts/init.d/tmpfs
+++ b/src/initscripts/init.d/tmpfs
@@ -15,11 +15,20 @@ case "$1" in
 		$0 restore
 		if [ ! -e $RRDLOG.bak/vnstat ]; then
 			mkdir -p $RRDLOG.bak/vnstat
-		fi
-
+    		fi
+		if [ ! -e $RRDLOG/vnstat ]; then
+			mkdir -p $RRDLOG/vnstat
+    		fi
 		#
 		# create some folders
 		#
+		if [ ! -e /var/lock/subsys ]; then
+			mkdir -p /var/lock/subsys
+		fi
+		if [ ! -e /var/lock/time ]; then
+			mkdir -p /var/lock/time
+			chown nobody.root /var/lock/time
+		fi
 		if [ ! -e /var/run/clamav ]; then
 			mkdir -p /var/run/clamav
 			chown clamav:clamav /var/run/clamav
@@ -34,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
@@ -63,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/