diff --git a/config/rootfiles/updater/filelists/files b/config/rootfiles/updater/filelists/files index 48c4164f2..294ba1fd3 100644 --- a/config/rootfiles/updater/filelists/files +++ b/config/rootfiles/updater/filelists/files @@ -18,6 +18,7 @@ etc/udev/rules.d/55-scsi-cdrom.rules etc/linuxigd/gatedesc.xml usr/local/bin/getiptstate usr/local/bin/makegraphs +usr/local/bin/squidctrl srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/speed.cgi srv/web/ipfire/cgi-bin/traffic.cgi diff --git a/lfs/squid b/lfs/squid index 6b689a8a9..b6145e92e 100644 --- a/lfs/squid +++ b/lfs/squid @@ -106,9 +106,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp -f $(DIR_SRC)/config/updxlrator/convert /var/ipfire/updatexlrator/bin/convert cp -f $(DIR_SRC)/config/updxlrator/lscache /var/ipfire/updatexlrator/bin/lscache -# this binary is incompatible with -# cp -f $(DIR_SRC)/config/updxlrator/setperms /var/ipfire/updatexlrator/bin/setperms - -mkdir -p /usr/lib/squid/errors.ipfire cp -fr $(DIR_SRC)/config/proxy/errors.ipfire/* /usr/lib/squid/errors.ipfire/ chmod 755 /usr/sbin/updxlrator /var/ipfire/updatexlrator/bin/checkup \ diff --git a/src/misc-progs/squidctrl.c b/src/misc-progs/squidctrl.c index 39289b6c3..119662030 100644 --- a/src/misc-progs/squidctrl.c +++ b/src/misc-progs/squidctrl.c @@ -32,7 +32,6 @@ int main(int argc, char *argv[]) { } else if (strcmp(argv[1], "flush") == 0) { safe_system("/etc/rc.d/init.d/squid flush"); } else if (strcmp(argv[1], "enable") == 0) { - safe_system("ln -fs ../init.d/squid /etc/rc.d/rc3.d/S99squid >/dev/null 2>&1"); safe_system("ln -fs ../init.d/squid /etc/rc.d/rc0.d/K00squid >/dev/null 2>&1"); safe_system("ln -fs ../init.d/squid /etc/rc.d/rc6.d/K00squid >/dev/null 2>&1"); } else if (strcmp(argv[1], "disable") == 0) {