summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2010-05-25 11:20:03 -0400
committerjim-p <jimp@pfsense.org>2010-05-25 11:27:31 -0400
commit2cd8563160aae75f624b0dfa3f9360480d19f555 (patch)
tree617b7535dff96546ae2795a77297006a629376ea /etc
parent78d7e759b6d67ee5fe3f91dde215ee9680346adb (diff)
downloadpfsense-2cd8563160aae75f624b0dfa3f9360480d19f555.zip
pfsense-2cd8563160aae75f624b0dfa3f9360480d19f555.tar.gz
Remove logs from temp config backup so they aren't clobbered when restored.
Diffstat (limited to 'etc')
-rwxr-xr-xetc/rc.firmware6
1 files changed, 6 insertions, 0 deletions
diff --git a/etc/rc.firmware b/etc/rc.firmware
index dbad338..f752335 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
OpenPOWER on IntegriCloud