Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

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

diff --git a/src/initscripts/init.d/tmpfs b/src/initscripts/init.d/tmpfs
index 41d6a1df96e7af51eab316c53f03963e9b23ad05..0e5a1e1e46b7839d61f42808a45699192cde0def 100644 (file)
--- a/src/initscripts/init.d/tmpfs
+++ b/src/initscripts/init.d/tmpfs
@@ -72,6 +72,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/