mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-27 19:23:24 +02:00
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:
1
config/rootfiles/core/48/filelists/perl-GD
Symbolic link
1
config/rootfiles/core/48/filelists/perl-GD
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/perl-GD
|
||||
@@ -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
|
||||
|
||||
1
config/rootfiles/core/49/filelists/perl-GD
Symbolic link
1
config/rootfiles/core/49/filelists/perl-GD
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/perl-GD
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user