From: ms Date: Fri, 17 Aug 2007 12:42:50 +0000 (+0000) Subject: Noch zwei Netzwerkfixes... X-Git-Tag: v2.3-beta1~482 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=50418f3877dbaa18d4f725044bf4d1d4bdb53a5f;ds=sidebyside Noch zwei Netzwerkfixes... git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@778 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- diff --git a/doc/language_issues.de b/doc/language_issues.de index 02415de62d..3f37f3d252 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -12,6 +12,7 @@ WARNING: translation string unused: add new ovpn WARNING: translation string unused: add-route WARNING: translation string unused: admin user password has been changed WARNING: translation string unused: administrator user password +WARNING: translation string unused: adsl settings WARNING: translation string unused: advproxy LDAP auth WARNING: translation string unused: advproxy NTLM auth WARNING: translation string unused: advproxy advanced proxy @@ -100,6 +101,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client WARNING: translation string unused: eciadsl help WARNING: translation string unused: eciadsl upload @@ -108,6 +110,7 @@ WARNING: translation string unused: email server can not be empty WARNING: translation string unused: enable javascript WARNING: translation string unused: enabled on WARNING: translation string unused: enabledtitle +WARNING: translation string unused: encapsulation WARNING: translation string unused: encrypted WARNING: translation string unused: err bk 1 WARNING: translation string unused: err bk 10 password @@ -146,6 +149,7 @@ WARNING: translation string unused: host WARNING: translation string unused: host configuration WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hours2 +WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: id WARNING: translation string unused: idle cpu WARNING: translation string unused: import @@ -162,10 +166,15 @@ WARNING: translation string unused: invalid port list WARNING: translation string unused: invalid time entered WARNING: translation string unused: invalid uplink speed WARNING: translation string unused: invalid upstream proxy username or password setting +WARNING: translation string unused: invalid vpi vpci WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side WARNING: translation string unused: iptable rules WARNING: translation string unused: irq cpu usage +WARNING: translation string unused: isdn +WARNING: translation string unused: isdn settings +WARNING: translation string unused: isdn1 +WARNING: translation string unused: isdn2 WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 WARNING: translation string unused: kernel version @@ -217,7 +226,11 @@ WARNING: translation string unused: network configuration WARNING: translation string unused: network status information WARNING: translation string unused: new optionsfw later WARNING: translation string unused: new optionsfw must boot +WARNING: translation string unused: no alcatelusb firmware WARNING: translation string unused: no cfg upload +WARNING: translation string unused: no eciadsl synch.bin file +WARNING: translation string unused: no fritzdsl driver +WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected WARNING: translation string unused: not enough disk space WARNING: translation string unused: o-no @@ -257,6 +270,7 @@ WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: polfile WARNING: translation string unused: pots +WARNING: translation string unused: present WARNING: translation string unused: profiles WARNING: translation string unused: proxy no proxy extend WARNING: translation string unused: proxy no proxy local @@ -330,6 +344,7 @@ WARNING: translation string unused: transparent on WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted +WARNING: translation string unused: unknown WARNING: translation string unused: update transcript WARNING: translation string unused: updates WARNING: translation string unused: updates is old1 @@ -347,7 +362,11 @@ WARNING: translation string unused: urlfilter update information WARNING: translation string unused: urlfilter update notification WARNING: translation string unused: urlfilter update results WARNING: translation string unused: use +WARNING: translation string unused: use dov +WARNING: translation string unused: use ibod +WARNING: translation string unused: vci number WARNING: translation string unused: view log +WARNING: translation string unused: vpi number WARNING: translation string unused: vpn on blue WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange diff --git a/doc/language_issues.en b/doc/language_issues.en index 8d21491335..59f1ba9f50 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -12,6 +12,7 @@ WARNING: translation string unused: add new ovpn WARNING: translation string unused: add-route WARNING: translation string unused: admin user password has been changed WARNING: translation string unused: administrator user password +WARNING: translation string unused: adsl settings WARNING: translation string unused: advproxy LDAP auth WARNING: translation string unused: advproxy NTLM auth WARNING: translation string unused: advproxy advanced proxy @@ -124,6 +125,7 @@ WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list WARNING: translation string unused: done +WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client WARNING: translation string unused: eciadsl help WARNING: translation string unused: eciadsl upload @@ -132,6 +134,7 @@ WARNING: translation string unused: email server can not be empty WARNING: translation string unused: enable javascript WARNING: translation string unused: enabled on WARNING: translation string unused: enabledtitle +WARNING: translation string unused: encapsulation WARNING: translation string unused: encrypted WARNING: translation string unused: err bk 1 WARNING: translation string unused: err bk 10 password @@ -172,6 +175,7 @@ WARNING: translation string unused: host WARNING: translation string unused: host configuration WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hours2 +WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: id WARNING: translation string unused: idle cpu WARNING: translation string unused: import @@ -189,10 +193,15 @@ WARNING: translation string unused: invalid port list WARNING: translation string unused: invalid time entered WARNING: translation string unused: invalid uplink speed WARNING: translation string unused: invalid upstream proxy username or password setting +WARNING: translation string unused: invalid vpi vpci WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side WARNING: translation string unused: iptable rules WARNING: translation string unused: irq cpu usage +WARNING: translation string unused: isdn +WARNING: translation string unused: isdn settings +WARNING: translation string unused: isdn1 +WARNING: translation string unused: isdn2 WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 WARNING: translation string unused: kernel version @@ -244,7 +253,11 @@ WARNING: translation string unused: network configuration WARNING: translation string unused: network status information WARNING: translation string unused: new optionsfw later WARNING: translation string unused: new optionsfw must boot +WARNING: translation string unused: no alcatelusb firmware WARNING: translation string unused: no cfg upload +WARNING: translation string unused: no eciadsl synch.bin file +WARNING: translation string unused: no fritzdsl driver +WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected WARNING: translation string unused: not enough disk space WARNING: translation string unused: notes @@ -285,6 +298,7 @@ WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: polfile WARNING: translation string unused: pots +WARNING: translation string unused: present WARNING: translation string unused: profiles WARNING: translation string unused: proxy no proxy extend WARNING: translation string unused: proxy no proxy local @@ -362,6 +376,7 @@ WARNING: translation string unused: transparent on WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted +WARNING: translation string unused: unknown WARNING: translation string unused: update transcript WARNING: translation string unused: updates WARNING: translation string unused: updates is old1 @@ -380,8 +395,12 @@ WARNING: translation string unused: urlfilter update information WARNING: translation string unused: urlfilter update notification WARNING: translation string unused: urlfilter update results WARNING: translation string unused: use +WARNING: translation string unused: use dov +WARNING: translation string unused: use ibod WARNING: translation string unused: user cpu +WARNING: translation string unused: vci number WARNING: translation string unused: view log +WARNING: translation string unused: vpi number WARNING: translation string unused: vpn on blue WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq index 29a59d3eab..583e55ea2c 100644 --- a/src/initscripts/init.d/dnsmasq +++ b/src/initscripts/init.d/dnsmasq @@ -21,7 +21,7 @@ case "${1}" in eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) ARGS= - [ "$DOMAIN_NAME_GREEN" == "" ] && ARGS="-s $DOMAIN_NAME_GREEN " + [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN " [ -e "/var/ipfire/red/active" ] && ARGS+="-r /var/ipfire/red/resolv.conf" loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network index e4f2a1b5b1..b2302e06a1 100644 --- a/src/initscripts/init.d/network +++ b/src/initscripts/init.d/network @@ -17,14 +17,13 @@ eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) init_networking() { - boot_mesg "Loading firewall modules into the kernel" modprobe iptable_nat || failed=1 for i in $(find /lib/modules/$(uname -r) -name ip_conntrack*); do - modprobe $i || failed=1 + modprobe $(basename $i | cut -d. -f1) || failed=1 done for i in $(find /lib/modules/$(uname -r) -name ip_nat*); do - modprobe $i || failed=1 + modprobe $(basename $i | cut -d. -f1) || failed=1 done (exit ${failed}) evaluate_retval