X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fupdater;h=8a815260d64fafe891bc53b3f755d6ed1ef8d478;hb=9e6394d923daa2a7d20b6d5bf6e4ae6efb332dae;hp=176ee8a4e0b7f9ec3626c07db4636c991ebc8ff8;hpb=2c4512303e09ba24da2425756c012340b1db2a6d;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/updater b/lfs/updater
index 176ee8a4e..8a815260d 100644
--- a/lfs/updater
+++ b/lfs/updater
@@ -54,13 +54,25 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	mkdir -p /install/updater
 	mkdir -p /install/packages
 
-	find $(DIR_SRC)/config/rootfiles/updater/filelists -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
+	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/*' \
 		--exclude='proc/*' --exclude='tmp/ROOTFILES'
 	mv -f /tmp/ROOTFILES /install/updater/ROOTFILES
-	tar -x -C /tmp -f /$(SNAME).tar
+	tar --preserve --numeric-owner -x  -C /tmp -f /$(SNAME).tar
 	rm -f /$(SNAME).tar
 	cd /tmp && tar cf /install/updater/files * && rm -rf *
 	cat /install/updater/ROOTFILES | grep -v "#" > /install/updater/ROOTFILES.tmp
@@ -70,13 +82,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Other files
 	cp $(DIR_SRC)/config/rootfiles/updater/update.sh /install/updater/
 	chmod 755 /install/updater/update.sh
-	cd /install/updater && tar cf /install/packages/core-upgrade-2.1-16.ipfire \
+	cd /install/updater && tar cf /install/packages/core-upgrade-2.1-23.ipfire \
 		update.sh files ROOTFILES
 	rm -rf /install/updater
 
 	sed -e "s/NAME/core-upgrade/g" \
 		-e "s/VER/2.1/g" \
-		-e "s/RELEASE/16/g" \
+		-e "s/RELEASE/23/g" \
 		-e "s/DEPS/$(DEPS)/g" \
-		-e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-16.ipfire | awk '{ print $$5 }'`/g" \
-		< /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-16
+		-e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-23.ipfire | awk '{ print $$5 }'`/g" \
+		< /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-23