Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

Conflicts:
	config/rootfiles/core/49/filelists/files
	config/rootfiles/core/49/update.sh
This commit is contained in:
Arne Fitzenreiter
2011-04-02 17:56:33 +02:00
11 changed files with 44 additions and 10 deletions

View File

@@ -0,0 +1 @@
../../../common/perl-GD

View File

@@ -2,3 +2,4 @@ etc/system-release
var/ipfire/backup/bin/backup.pl
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/proxy.cgi

View File

@@ -0,0 +1 @@
../../../common/perl-GD

View File

@@ -26,7 +26,7 @@
#
# Remove old core updates from pakfire cache to save space...
core=48
core=49
for (( i=1; i<=$core; i++ ))
do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire