From: Stefan Schantl <Stevee@ipfire.org>
Date: Tue, 24 Nov 2009 21:12:28 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.9-beta1~586
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=d310033889c0afd5948e0e61bef439221b58f8f0;hp=58c1bbd5e3cb2faf7f04ae9c321354ece050818f

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

diff --git a/config/rootfiles/core/34/filelists/files b/config/rootfiles/core/34/filelists/files
index f1fe040bb8..ff91eb4a24 100644
--- a/config/rootfiles/core/34/filelists/files
+++ b/config/rootfiles/core/34/filelists/files
@@ -1,3 +1,4 @@
 etc/system-release
 etc/rc.d/init.d/networking/red
+etc/rc.d/init.d/tmpfs
 boot/grub/grub.conf
diff --git a/src/initscripts/init.d/tmpfs b/src/initscripts/init.d/tmpfs
index 41d6a1df96..0e5a1e1e46 100644
--- 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/