webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

Browse Source
This commit is contained in:
Michael Tremer
2009-03-01 13:11:04 +01:00
parent c4a45281a1 a61948ad39
commit 35ebc8ea92
6 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
config/qos/makeqosscripts.pl
View File

@@ -75,6 +75,7 @@ $qossettings{'RED_DEV'} = `cat /var/ipfire/red/iface`;
$qossettings{'IMQ_DEV'} = 'imq0'; $qossettings{'IMQ_DEV'} = 'imq0';
$qossettings{'TOS'} = ''; $qossettings{'TOS'} = '';
$qossettings{'VALID'} = 'yes'; $qossettings{'VALID'} = 'yes';
$qossettings{'IMQ_MODE'} = 'PREROUTING';
&General::readhash("${General::swroot}/qos/settings", \%qossettings); &General::readhash("${General::swroot}/qos/settings", \%qossettings);
@@ -498,6 +499,9 @@ foreach $subclassentry (sort @subclasses) {
print "\ttc filter add dev $qossettings{'DEVICE'} parent 2:0 prio 0 protocol ip handle $qossettings{'SCLASS'} fw flowid 2:$qossettings{'SCLASS'}\n"; print "\ttc filter add dev $qossettings{'DEVICE'} parent 2:0 prio 0 protocol ip handle $qossettings{'SCLASS'} fw flowid 2:$qossettings{'SCLASS'}\n";
} }
} }
if ( $qossettings{'IMQ_MODE'} eq 'POSTROUTING' )
{
print <<END print <<END
### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES ### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES
@@ -509,6 +513,22 @@ print <<END
### SET TOS ### SET TOS
END END
; ;
}
else
{
print <<END
### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES
iptables -t mangle -N QOS-INC
iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0
iptables -t mangle -I PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC
iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS
### SET TOS
END
;
}
foreach $tosruleentry (sort @tosrules) foreach $tosruleentry (sort @tosrules)
{ {
@tosruleline = split( /\;/, $tosruleentry ); @tosruleline = split( /\;/, $tosruleentry );
@@ -655,15 +675,18 @@ print <<END
tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1 tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1
# STOP IMQ-DEVICE # STOP IMQ-DEVICE
ip link set $qossettings{'IMQ_DEV'} down >/dev/null 2>&1 ip link set $qossettings{'IMQ_DEV'} down >/dev/null 2>&1
iptables -t mangle --delete POSTROUTING -m mark ! --mark 0 -o ! $qossettings{'RED_DEV'} -j IMQ --todev 0 iptables -t mangle --delete POSTROUTING -m mark ! --mark 0 -o ! $qossettings{'RED_DEV'} -j IMQ --todev 0 >/dev/null 2>&1
iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0 >/dev/null 2>&1
# rmmod imq # this crash on 2.6.25.xx # rmmod imq # this crash on 2.6.25.xx
# REMOVE & FLUSH CHAINS # REMOVE & FLUSH CHAINS
iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT >/dev/null 2>&1 iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT >/dev/null 2>&1
iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1 iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1
iptables -t mangle --flush QOS-OUT >/dev/null 2>&1 iptables -t mangle --flush QOS-OUT >/dev/null 2>&1
iptables -t mangle --delete-chain QOS-OUT >/dev/null 2>&1 iptables -t mangle --delete-chain QOS-OUT >/dev/null 2>&1
iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC >/dev/null 2>&1
iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1
iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC >/dev/null 2>&1
iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1
iptables -t mangle --flush QOS-INC >/dev/null 2>&1 iptables -t mangle --flush QOS-INC >/dev/null 2>&1
iptables -t mangle --delete-chain QOS-INC >/dev/null 2>&1 iptables -t mangle --delete-chain QOS-INC >/dev/null 2>&1
iptables -t mangle --flush QOS-TOS >/dev/null 2>&1 iptables -t mangle --flush QOS-TOS >/dev/null 2>&1

1
config/rootfiles/core/27/files
View File

@@ -57,3 +57,4 @@ usr/bin/wpakey
usr/local/bin/rebuild-initrd usr/local/bin/rebuild-initrd
var/ipfire/menu.d/20-status.menu var/ipfire/menu.d/20-status.menu
srv/web/ipfire/cgi-bin/atm-status.cgi srv/web/ipfire/cgi-bin/atm-status.cgi
usr/local/bin/backupiso

2
lfs/mkinitcpio
View File

@@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
sed -i 's|^FILELIST=.*|FILELIST="$$(mktemp)"|g' /sbin/mkinitcpio sed -i 's|^FILELIST=.*|FILELIST="$$(mktemp)"|g' /sbin/mkinitcpio
sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata filesystems"|g' /etc/mkinitcpio.conf sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata filesystems"|g' /etc/mkinitcpio.conf
sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3"|g' /etc/mkinitcpio.conf sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3"|g' /etc/mkinitcpio.conf
# sed -i 's|ide-cd|ide-cd_mod|g' /lib/initcpio/install/ide sed -i 's|ide-cd|ide-cd ide-generic|g' /lib/initcpio/install/ide
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

1
src/initscripts/init.d/snort
View File

@@ -74,6 +74,7 @@ case "$1" in
IFACE=`/bin/cat /var/ipfire/red/iface 2>/dev/null | /usr/bin/tr -d '\012'` IFACE=`/bin/cat /var/ipfire/red/iface 2>/dev/null | /usr/bin/tr -d '\012'`
sed -e "s/^Interface.*/Interface ${IFACE}/" /var/ipfire/guardian/guardian.conf > temp sed -e "s/^Interface.*/Interface ${IFACE}/" /var/ipfire/guardian/guardian.conf > temp
mv temp /var/ipfire/guardian/guardian.conf mv temp /var/ipfire/guardian/guardian.conf
chown nobody.root /var/ipfire/guardian/guardian.conf
boot_mesg "Starting Guardian..." boot_mesg "Starting Guardian..."
loadproc /usr/local/bin/guardian.pl -c /var/ipfire/guardian/guardian.conf loadproc /usr/local/bin/guardian.pl -c /var/ipfire/guardian/guardian.conf

19
src/install+setup/install/main.c
View File

@@ -90,7 +90,9 @@ int main(int argc, char *argv[])
newtInit(); newtInit();
newtCls(); newtCls();
/* Do usb detection first for usb keyboard */ newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
if (! (cmdfile = fopen("/proc/cmdline", "r"))) if (! (cmdfile = fopen("/proc/cmdline", "r")))
{ {
fprintf(flog, "Couldn't open commandline: /proc/cmdline\n"); fprintf(flog, "Couldn't open commandline: /proc/cmdline\n");
@@ -104,8 +106,14 @@ int main(int argc, char *argv[])
} }
} }
// mysystem("/sbin/modprobe ide-generic"); // Load ata-piix prior kudzu because kudzu use ata-generic for ich7
// mysystem("/sbin/modprobe generic"); mysystem("/sbin/modprobe ata_piix");
// Starting hardware detection
runcommandwithstatus("/bin/probehw.sh", "Probing Hardware ...");
// Load common modules
mysystem("/sbin/modprobe ide-generic");
mysystem("/sbin/modprobe ide-cd"); mysystem("/sbin/modprobe ide-cd");
mysystem("/sbin/modprobe ide-disk"); mysystem("/sbin/modprobe ide-disk");
mysystem("/sbin/modprobe uhci-hcd"); mysystem("/sbin/modprobe uhci-hcd");
@@ -138,12 +146,7 @@ int main(int argc, char *argv[])
ctr = langtrs[choice]; ctr = langtrs[choice];
strcpy(shortlangname, shortlangnames[choice]); strcpy(shortlangname, shortlangnames[choice]);
newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
newtPushHelpLine(ctr[TR_HELPLINE]); newtPushHelpLine(ctr[TR_HELPLINE]);
sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
// Starting hardware detection
runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]);
sprintf(message, ctr[TR_WELCOME], NAME); sprintf(message, ctr[TR_WELCOME], NAME);
newtWinMessage(title, ctr[TR_OK], message); newtWinMessage(title, ctr[TR_OK], message);

2
src/scripts/backupiso
View File

@@ -2,7 +2,7 @@
# FIXME: edit this lines before release # FIXME: edit this lines before release
URL=http://download.ipfire.org/iso/ URL=http://download.ipfire.org/iso/
ISO=ipfire-2.3.i586-full.iso ISO=ipfire-2.3.i586-full-core27.iso
#URL=http://www.rowie.at/ipfire/builds/v2.3test/Beta3/20081001-17uhr/ #URL=http://www.rowie.at/ipfire/builds/v2.3test/Beta3/20081001-17uhr/
#ISO=ipfire-2.3-test.i586-full.iso #ISO=ipfire-2.3-test.i586-full.iso