Fix updater & rootfiles

diff --git a/config/rootfiles/common/oldcore7 b/config/rootfiles/common/oldcore7
index f6ec3fc5f6064f748dc570f42164b5f4f2ae4628..21e318a9d5c19f4e1057ebf2e3f5af299939a691 100644 (file)
--- a/config/rootfiles/common/oldcore7
+++ b/config/rootfiles/common/oldcore7
@@ -3,7 +3,7 @@ etc/rc.d/init.d/smartenabler
 etc/rc.d/init.d/networking/red
 srv/web/ipfire/cgi-bin/graphs.cgi
 srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
-srv/web/ipfire/cgi-bin/network.cgi
+#srv/web/ipfire/cgi-bin/network.cgi
 srv/web/ipfire/cgi-bin/optionsfw.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 usr/local/bin/makegraphs

diff --git a/config/rootfiles/updater/filelists/files b/config/rootfiles/updater/filelists/files
index 5d2a4e6caabcccb5349126ec1774c1a03e3954ff..0a697ea4a155a3d930fa94cf71368c8d2bf114b7 100644 (file)
--- a/config/rootfiles/updater/filelists/files
+++ b/config/rootfiles/updater/filelists/files
@@ -28,9 +28,8 @@ srv/web/ipfire/cgi-bin/connections.cgi
 srv/web/ipfire/cgi-bin/graphs.cgi
 srv/web/ipfire/cgi-bin/pppsetup.cgi
 srv/web/ipfire/cgi-bin/netexternal.cgi
-srv/web/ipfire/cgi-bin/netinernal.cgi
+srv/web/ipfire/cgi-bin/netinternal.cgi
 srv/web/ipfire/cgi-bin/netother.cgi
-
 srv/web/ipfire/cgi-bin/system.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
 var/ipfire/sensors/

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index 2f694566486dafa3874411922d03f8721ea029b7..b1e2d9685e237c9e676969660a4556bac22ee8f0 100755 (executable)
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -56,6 +56,9 @@ echo var/updatexlerator >> /opt/pakfire/tmp/ROOTFILES
 echo lib/iptables >> /opt/pakfire/tmp/ROOTFILES
 echo lib/modules >> /opt/pakfire/tmp/ROOTFILES
 echo boot >> /opt/pakfire/tmp/ROOTFILES
+echo srv/web/ipfire/cgi-bin/fwhits.cgi >> /opt/pakfire/tmp/ROOTFILES
+echo srv/web/ipfire/cgi-bin/network.cgi >> /opt/pakfire/tmp/ROOTFILES
+echo srv/web/ipfire/cgi-bin/traffics.cgi >> /opt/pakfire/tmp/ROOTFILES
 #
 tar cjvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 \
    -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' -C / > /dev/null 2>&1 
@@ -70,6 +73,12 @@ rm -rf /etc/rc.d/rc3.d/S20collectd
 #
 rm -rf /etc/rc.d/rc3.d/S99squid
 #
+# Delete old cgi files ...
+#
+rm -rf /srv/web/ipfire/cgi-bin/fwhits.cgi
+rm -rf /srv/web/ipfire/cgi-bin/network.cgi
+rm -rf /srv/web/ipfire/cgi-bin/traffics.cgi
+#
 # Delete old iptables libs...
 #
 rm -rf /lib/iptables