diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index d12e8b39d..a374a383b 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -75,6 +75,7 @@ $qossettings{'RED_DEV'} = `cat /var/ipfire/red/iface`; $qossettings{'IMQ_DEV'} = 'imq0'; $qossettings{'TOS'} = ''; $qossettings{'VALID'} = 'yes'; +$qossettings{'IMQ_MODE'} = 'PREROUTING'; &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"; } } + +if ( $qossettings{'IMQ_MODE'} eq 'POSTROUTING' ) +{ print </dev/null 2>&1 # STOP IMQ-DEVICE 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 # 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-TOS >/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 FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC - iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS + 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 >/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 --delete-chain QOS-INC >/dev/null 2>&1 iptables -t mangle --flush QOS-TOS >/dev/null 2>&1 diff --git a/config/rootfiles/core/27/files b/config/rootfiles/core/27/files index b69e5bfe9..97aef8eff 100644 --- a/config/rootfiles/core/27/files +++ b/config/rootfiles/core/27/files @@ -57,3 +57,4 @@ usr/bin/wpakey usr/local/bin/rebuild-initrd var/ipfire/menu.d/20-status.menu srv/web/ipfire/cgi-bin/atm-status.cgi +usr/local/bin/backupiso diff --git a/lfs/mkinitcpio b/lfs/mkinitcpio index 0c6e70ebf..0251d5786 100644 --- a/lfs/mkinitcpio +++ b/lfs/mkinitcpio @@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) 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|^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) @$(POSTBUILD) diff --git a/src/initscripts/init.d/snort b/src/initscripts/init.d/snort index 16f7953ef..a2db0de0f 100644 --- a/src/initscripts/init.d/snort +++ b/src/initscripts/init.d/snort @@ -74,6 +74,7 @@ case "$1" in 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 mv temp /var/ipfire/guardian/guardian.conf + chown nobody.root /var/ipfire/guardian/guardian.conf boot_mesg "Starting Guardian..." loadproc /usr/local/bin/guardian.pl -c /var/ipfire/guardian/guardian.conf diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 84cc51e99..8c7f06436 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -90,7 +90,9 @@ int main(int argc, char *argv[]) newtInit(); 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"))) { fprintf(flog, "Couldn't open commandline: /proc/cmdline\n"); @@ -104,8 +106,14 @@ int main(int argc, char *argv[]) } } - // mysystem("/sbin/modprobe ide-generic"); - // mysystem("/sbin/modprobe generic"); + // Load ata-piix prior kudzu because kudzu use ata-generic for ich7 + 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-disk"); mysystem("/sbin/modprobe uhci-hcd"); @@ -138,12 +146,7 @@ int main(int argc, char *argv[]) ctr = langtrs[choice]; strcpy(shortlangname, shortlangnames[choice]); - newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN ); 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); newtWinMessage(title, ctr[TR_OK], message); diff --git a/src/scripts/backupiso b/src/scripts/backupiso index ba1725213..bbcfe29c9 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -2,7 +2,7 @@ # FIXME: edit this lines before release 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/ #ISO=ipfire-2.3-test.i586-full.iso