mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 03:33:25 +02:00
Am Pakfire weitergearbeitet.
CGI erweitert und mit neuen Funktionen versehen. Paketformat grundlegend geaendert. UpdateBooster gefixt. Avira+Avast als Updatequelle eingefuegt. VPN-Watch ins log.dat. DHCP-Server startet nach der Installation. Einen String im Installer verschoenert :D git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@639 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
@@ -5,7 +5,7 @@ background = ffffff
|
||||
gfxmenu /grub/message
|
||||
title IPFire (1024x768)
|
||||
root (hd0,0)
|
||||
kernel /vmlinuz-ipfire root=ROOT panic=10 vga=791 splash=silent MOUNT
|
||||
kernel /vmlinuz-ipfire root=ROOT panic=10 vga=791 MOUNT
|
||||
initrd /ipfirerd.img
|
||||
savedefault 0
|
||||
title IPFire (VESA)
|
||||
@@ -15,7 +15,7 @@ title IPFire (VESA)
|
||||
savedefault 1
|
||||
title IPFire SMP (1024x768)
|
||||
root (hd0,0)
|
||||
kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off vga=791 splash=silent MOUNT
|
||||
kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off vga=791 MOUNT
|
||||
initrd /ipfirerd-smp.img
|
||||
savedefault 2
|
||||
title IPFire SMP (VESA)
|
||||
@@ -25,7 +25,7 @@ title IPFire SMP (VESA)
|
||||
savedefault 3
|
||||
title IPFire SMP-HT (Intel Pentium 4) (1024x768)
|
||||
root (hd0,0)
|
||||
kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht vga=791 splash=silent MOUNT
|
||||
kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht vga=791 MOUNT
|
||||
initrd /ipfirerd-smp.img
|
||||
savedefault 4
|
||||
title IPFire SMP-HT (Intel Pentium 4) (VESA)
|
||||
|
||||
@@ -9,9 +9,8 @@
|
||||
|
||||
use strict;
|
||||
|
||||
my $apphome="/var/ipfire/updatexlrator";
|
||||
my $logfile="/var/log/updatexlrator/download.log";
|
||||
my $debug=(-e "$apphome/debug");
|
||||
my $debug = 0;
|
||||
my $updcachedir="/srv/web/ipfire/html/updatecache";
|
||||
my $updfile='';
|
||||
my @metadata=();
|
||||
@@ -30,10 +29,10 @@ $updfile = substr($dsturl,rindex($dsturl,"/")+1);
|
||||
if ($debug)
|
||||
{
|
||||
&writelog("Retrieving file for local cache: $updfile");
|
||||
`$apphome/bin/wget -nc -nd -nv -P $updcachedir/download $dsturl >>$logfile 2>&1`;
|
||||
`/usr/bin/wget -nc -nd -nv -P $updcachedir/download $dsturl >>$logfile 2>&1`;
|
||||
} else
|
||||
{
|
||||
`$apphome/bin/wget -nc -nd -nv -P $updcachedir/download $dsturl 2>&1`;
|
||||
`/usr/bin/wget -nc -nd -nv -P $updcachedir/download $dsturl 2>&1`;
|
||||
}
|
||||
|
||||
if ($debug) { &writelog("Moving file into the cache directory -> \"$updcachedir/$updfile\""); }
|
||||
|
||||
@@ -107,8 +107,26 @@ while (<>) {
|
||||
{
|
||||
$from_local_cache = &cache_access($dsturl,$hostaddr,$username,"Symantec");
|
||||
}
|
||||
|
||||
|
||||
# -----------------------------------------------------------
|
||||
# Section: Avira Downloads
|
||||
# -----------------------------------------------------------
|
||||
|
||||
if ($dsturl =~ m@^http://dl[0-9]\.avgate\.net/.*\.(htm|html|gz)$@i)
|
||||
{
|
||||
$from_local_cache = &cache_access($dsturl,$hostaddr,$username,"Avira");
|
||||
}
|
||||
|
||||
# -----------------------------------------------------------
|
||||
# Section: Avast Downloads
|
||||
# -----------------------------------------------------------
|
||||
|
||||
if ($dsturl =~ m@^http://download[0-99]\.avast\.com/.*\.(exe|zip|vps|stamp|vpu)$@i)
|
||||
{
|
||||
$from_local_cache = &cache_access($dsturl,$hostaddr,$username,"Avast");
|
||||
}
|
||||
|
||||
# -----------------------------------------------------------
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user