From 2cd8563160aae75f624b0dfa3f9360480d19f555 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 25 May 2010 11:20:03 -0400
Subject: [PATCH] Remove logs from temp config backup so they aren't clobbered
 when restored.

---
 etc/rc.firmware | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/etc/rc.firmware b/etc/rc.firmware
index dbad338df6..f752335b29 100755
--- a/etc/rc.firmware
+++ b/etc/rc.firmware
@@ -159,6 +159,9 @@ pfSenseNanoBSDupgrade)
 	/bin/mkdir -p /tmp/configbak
 	cp -Rp /conf/* /tmp/configbak 2>/dev/null
 
+	# Remove logs from backup dir to avoid clobbering upon restore.
+	rm /tmp/configbak/*_log.txt 2>/dev/null
+
 	echo "" >> /conf/upgrade_log.txt
 
 	echo "Installing ${IMG}." >> /conf/upgrade_log.txt 2>&1
@@ -402,6 +405,9 @@ pfSenseupgrade)
 	/bin/mkdir -p /tmp/configbak
 	cp -Rp /conf/* /tmp/configbak 2>/dev/null
 
+	# Remove logs from backup dir to avoid clobbering upon restore.
+	rm /tmp/configbak/*_log.txt 2>/dev/null
+
 	# tar explode image onto hd
 	echo "Installing $IMG." >> /conf/upgrade_log.txt 2>&1
 	cd / && /usr/bin/tar xzUPf $IMG >> /conf/upgrade_log.txt 2>&1