Merge remote-tracking branch 'origin/next' into thirteen

[people/teissler/ipfire-2.x.git] / src / initscripts / init.d / tmpfs

diff --git a/src/initscripts/init.d/tmpfs b/src/initscripts/init.d/tmpfs
index a7ead9d289ddda52a77ea7022319934cc869113e..848dec6ad4ff0fc55a97b644517576ad41128af1 100644 (file)
--- a/src/initscripts/init.d/tmpfs
+++ b/src/initscripts/init.d/tmpfs
@@ -22,6 +22,13 @@ case "$1" in
                #
                # 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
@@ -36,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
@@ -65,6 +68,11 @@ case "$1" in
                evaluate_retval
                ;;
        restore)
+               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/