Moved squid update from core15 back to core14

diff --git a/config/rootfiles/core/14/files b/config/rootfiles/core/14/files
index bc7515c2c8b60b40714d2ee103d467185a63ea44..bfced96b62122def00a41f237b576160747b3513 100644 (file)
--- a/config/rootfiles/core/14/files
+++ b/config/rootfiles/core/14/files
@@ -258,3 +258,9 @@ lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/saa7115.ko
 lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/tda7432.ko
 lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/bt8xx/bttv.ko
 lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/tveeprom.ko
+etc/squid
+usr/lib/squid
+usr/sbin/squid
+srv/web/ipfire/cgi-bin/updatexlrator.cgi
+srv/web/ipfire/html/images/updxl-src-avg.gif
+usr/sbin/updxlrator

diff --git a/config/rootfiles/core/14/update.sh b/config/rootfiles/core/14/update.sh
index a846b5b98fd2d9277bd8bb368f213c30d54770d0..9cce251427557deb8f8aa8de4187d4822204caae 100644 (file)
--- a/config/rootfiles/core/14/update.sh
+++ b/config/rootfiles/core/14/update.sh
@@ -5,6 +5,8 @@ rm /lib/modules/2.6.16.57-ipfire/kernel/drivers/media/video/video-buf.ko
 rm /lib/modules/2.6.16.57-ipfire/kernel/drivers/media/dvb/frontends/dib3000-common.ko
 rm /lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/video-buf.ko
 rm /lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/dvb/frontends/dib3000-common.ko
+/etc/init.d/squid stop
 extract_files
+/etc/init.d/squid start
 depmod -a 2.6.16.57-ipfire
 depmod -a 2.6.16.57-ipfire-smp

diff --git a/config/rootfiles/core/15/files b/config/rootfiles/core/15/files
index b2f830e64e18da0982b9099c485c4749a788326c..ba8bce191f710302ee3b1df174f12ca57db2fa5e 100644 (file)
--- a/config/rootfiles/core/15/files
+++ b/config/rootfiles/core/15/files
@@ -2,9 +2,3 @@ etc/init.d/mISDN
 etc/modprobe.d/blacklist
 usr/bin/bc
 usr/bin/dc
-etc/squid
-usr/lib/squid
-usr/sbin/squid
-srv/web/ipfire/cgi-bin/updatexlrator.cgi
-srv/web/ipfire/html/images/updxl-src-avg.gif
-usr/sbin/updxlrator