From: Maniacikarus <maniacikarus@ipfire.org>
Date: Wed, 5 Nov 2008 17:36:08 +0000 (+0100)
Subject: Fixed Upgrade not backup cache directores of proxy and booster
X-Git-Tag: v2.3-final~5^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=261c412b8208a3d5c330bcb7d267ba4e079b7fab;p=people%2Fstevee%2Fipfire-2.x.git

Fixed Upgrade not backup cache directores of proxy and booster
Do not override some important config file when upgrade
---

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index e6b26d3224..ad84c3b61e 100755
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -63,6 +63,14 @@ echo srv/web/ipfire/cgi-bin/traffics.cgi >> /opt/pakfire/tmp/ROOTFILES
 echo srv/web/ipfire/cgi-bin/graphs.cgi >> /opt/pakfire/tmp/ROOTFILES
 echo srv/web/ipfire/cgi-bin/qosgraph.cgi >> /opt/pakfire/tmp/ROOTFILES
 #
+
+# Remove some files from the rootfiles
+cat /opt/pakfire/tmp/ROOTFILES \
+	| grep -v "var/log/cache" \
+	| grep -v "var/updatecache" > /opt/pakfire/tmp/ROOTFILESNEW
+
+mv -f /opt/pakfire/tmp/ROOTFILESNEW /opt/pakfire/tmp/ROOTFILES
+
 tar czvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.gz \
    -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' -C / > /dev/null 2>&1 
 echo
diff --git a/lfs/updater b/lfs/updater
index 2cf06aa50e..8e280d2400 100644
--- a/lfs/updater
+++ b/lfs/updater
@@ -55,6 +55,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	mkdir -p /install/packages
 
 	find $(DIR_SRC)/config/rootfiles/updater/filelists/* -maxdepth 1 | xargs cat >> /tmp/ROOTFILES
+	cat /tmp/ROOTFILES \
+		| grep -v "etc/httpd/conf" \
+		| grep -v "etc/ssl/openssl.cnf" \
+		| grep -v "etc/ssh/sshd_config" \
+		| grep -v "etc/ipsec.conf" \
+		| grep -v "etc/ipsec.secrets" \
+		| grep -v "etc/snort/snort.conf" \
+		| grep -v "etc/squid/squid.conf" \
+		| grep -v "srv/web/ipfire/html/proxy.pac" \
+		| grep -v "srv/web/ipfire/html/wpad.dat" \
+		> /tmp/ROOTFILESNEW
+	mv -f /tmp/ROOTFILESNEW /tmp/ROOTFILES
 	sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
 	tar -c -C / --files-from=/tmp/ROOTFILES \
 		-f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \