From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 872d5a1e33e9fb6761c06cf5e251f39470a0edd9 Date: Mon, 28 Apr 2014 23:37:14 +0200 Message-ID: <20140428213714.62238212B3@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1004827125952176898==" List-Id: --===============1004827125952176898== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 872d5a1e33e9fb6761c06cf5e251f39470a0edd9 (commit) from 107060da53570e15281a173365a9e56149171d41 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 872d5a1e33e9fb6761c06cf5e251f39470a0edd9 Author: Arne Fitzenreiter Date: Mon Apr 28 23:36:03 2014 +0200 pppsetup: add atm device selection. ----------------------------------------------------------------------- Summary of changes: doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 1 + doc/language_missings | 4 ++++ html/cgi-bin/pppsetup.cgi | 16 ++++++++++------ langs/de/cgi-bin/de.pl | 3 ++- langs/en/cgi-bin/en.pl | 3 ++- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- langs/nl/cgi-bin/nl.pl | 2 +- langs/pl/cgi-bin/pl.pl | 2 +- langs/ru/cgi-bin/ru.pl | 2 +- langs/tr/cgi-bin/tr.pl | 2 +- src/initscripts/init.d/networking/red | 11 ++++++----- 17 files changed, 36 insertions(+), 19 deletions(-) Difference in files: diff --git a/doc/language_issues.es b/doc/language_issues.es index dbccd8f..32e688c 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -588,6 +588,7 @@ WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent +WARNING: untranslated string: atm device WARNING: untranslated string: attention WARNING: untranslated string: bit WARNING: untranslated string: bytes diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 4acdaf4..a5a15c9 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -598,6 +598,7 @@ WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent +WARNING: untranslated string: atm device WARNING: untranslated string: attention WARNING: untranslated string: bit WARNING: untranslated string: bytes diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 949acdc..b649200 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -600,6 +600,7 @@ WARNING: untranslated string: addons WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent +WARNING: untranslated string: atm device WARNING: untranslated string: bit WARNING: untranslated string: bytes WARNING: untranslated string: ccd err isipsecrw diff --git a/doc/language_issues.pl b/doc/language_issues.pl index dbccd8f..32e688c 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -588,6 +588,7 @@ WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent +WARNING: untranslated string: atm device WARNING: untranslated string: attention WARNING: untranslated string: bit WARNING: untranslated string: bytes diff --git a/doc/language_issues.ru b/doc/language_issues.ru index e57e91e..7c1b5f8 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -591,6 +591,7 @@ WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent +WARNING: untranslated string: atm device WARNING: untranslated string: attention WARNING: untranslated string: bit WARNING: untranslated string: bytes diff --git a/doc/language_issues.tr b/doc/language_issues.tr index e968b59..93166e6 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -641,6 +641,7 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs +WARNING: untranslated string: atm device WARNING: untranslated string: bytes WARNING: untranslated string: fwhost err hostip WARNING: untranslated string: route config changed diff --git a/doc/language_missings b/doc/language_missings index 742f1f7..601c9c7 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -23,6 +23,7 @@ < age shour < age sminute < age ssecond +< atm device < attention < bit < ccd add @@ -500,6 +501,7 @@ < age sminute < age ssecond < Async logging enabled +< atm device < attention < bit < ccd add @@ -968,6 +970,7 @@ < age shour < age sminute < age ssecond +< atm device < attention < bit < ccd add @@ -1413,6 +1416,7 @@ < age shour < age sminute < age ssecond +< atm device < attention < bit < ccd add diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index edec826..f0100a8 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -150,6 +150,9 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) if (($pppsettings{'VPI'} eq '0') && ($pppsettings{'VCI'} eq = '0')) { $errormessage =3D $Lang::tr{'invalid vpi vpci'}; goto ERROR; } + if ($pppsettings{'ATM_DEV'} eq '') { + $errormessage =3D $Lang::tr{'invalid input'}; + goto ERROR; } if ( $pppsettings{'PROTOCOL'} eq '' ) { $errormessage =3D $Lang::tr{'invalid input'}; goto ERROR; } @@ -723,11 +726,12 @@ if ($pppsettings{'TYPE'} =3D~ /^(pppoeatm|pptpatm)$/) =20 print < - $L= ang::tr{'adsl settings'}: + $L= ang::tr{'atm settings'}: - + $Lang::tr{'atm device'} + $Lang::tr{'encapsulation'}: - + - $Lang::tr{'vci number'} - + $Lang::tr{'vci number'} + END ; @@ -939,6 +942,7 @@ sub initprofile $pppsettings{'ENCAP'} =3D '0'; $pppsettings{'VPI'} =3D '1'; $pppsettings{'VCI'} =3D '32'; + $pppsettings{'ATM_DEV'} =3D '0'; $pppsettings{'PPTP_PEER'} =3D '10.0.0.138'; $pppsettings{'PPTP_NICCFG'} =3D '10.0.0.140/24 broadcast 10.0.0.255'; $pppsettings{'PPTP_ROUTE'} =3D ''; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 7c17621..2dd87d2 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -99,7 +99,6 @@ 'admin user password has been changed' =3D> 'Passwort f=C3=BCr Benutzer admi= n wurde ge=C3=A4ndert.', 'admin users' =3D> 'Liste der Benutzer mit Super User Rechten', 'administrator user password' =3D> 'Passwort f=C3=BCr Benutzer "admin&q= uot;:', -'adsl settings' =3D> 'ADSL-Einstellungen', 'advanced' =3D> 'Erweitert', 'advanced server' =3D> 'Erweiterte Server-Optionen', 'advproxy AUTH always required' =3D> 'Authentifizierung f=C3=BCr uneingeschr= =C3=A4nkte Quelladressen erforderlich', @@ -366,6 +365,8 @@ 'are you sure' =3D> 'Sind Sie sicher?', 'arp table entries' =3D> 'Eintr=C3=A4ge der ARP-Tabelle', 'artist' =3D> 'K=C3=BCnstler', +'atm device' =3D> 'Device:', +'atm settings' =3D> 'ATM-Einstellungen', 'attemps' =3D> 'Versuche', 'attention' =3D> 'ACHTUNG', 'august' =3D> 'August', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index a8e55f5..67f4269 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -99,7 +99,6 @@ 'admin user password has been changed' =3D> 'Admin user password has been ch= anged.', 'admin users' =3D> 'User with superuser rights', 'administrator user password' =3D> 'Admin user password:', -'adsl settings' =3D> 'ADSL settings', 'advanced' =3D> 'Advanced', 'advanced server' =3D> 'Advanced server options', 'advproxy AUTH always required' =3D> 'Require authentication for unrestricte= d source addresses', @@ -368,6 +367,8 @@ 'are you sure' =3D> 'Are you sure?', 'arp table entries' =3D> 'ARP Table Entries', 'artist' =3D> 'Artist', +'atm device' =3D> 'Device:', +'atm settings' =3D> 'ATM settings', 'attemps' =3D> 'Attempts', 'attention' =3D> 'ATTENTION', 'august' =3D> 'August', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 19057c7..ae5bf14 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -90,7 +90,6 @@ 'admin user password has been changed' =3D> 'El password del usuario Admin h= a cambiado', 'admin users' =3D> 'Usuario con niveles de superusuario (root)', 'administrator user password' =3D> 'Contrase=C3=B1a del usuario Admin:', -'adsl settings' =3D> 'Configuraciones ADSL', 'advanced' =3D> 'Avanzadas', 'advanced server' =3D> 'Opciones avanzadas de servidor', 'advproxy AUTH always required' =3D> 'Se necesita autentificaci=C3=B3n para = acceso irrestricto de direcciones de or=C3=ADgen', @@ -349,6 +348,7 @@ 'are you sure' =3D> '=C2=BFEsta seguro?', 'arp table entries' =3D> 'Tabla de entradas ARP:', 'artist' =3D> 'Artista', +'atm settings' =3D> 'Configuraciones ATM', 'attemps' =3D> 'Intentos', 'august' =3D> 'Agosto', 'authentication' =3D> 'Autenticaci=C3=B3n', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index f80f112..84e15a8 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -92,7 +92,6 @@ 'admin user password has been changed' =3D> 'Le mot de passe admin a =C3=A9t= =C3=A9 chang=C3=A9.', 'admin users' =3D> 'Utilisateur avec droits super-utilisateur', 'administrator user password' =3D> 'Mot de passe de l\'administrateur:', -'adsl settings' =3D> 'R=C3=A9glages ADSL', 'advanced' =3D> 'Avanc=C3=A9', 'advanced server' =3D> 'Options avanc=C3=A9es du serveur', 'advproxy AUTH always required' =3D> 'Exige l\'authentification pour un acc= =C3=A8s sans restriction des adresses sources', @@ -351,6 +350,7 @@ 'are you sure' =3D> 'Etes vous s=C3=BBr ?', 'arp table entries' =3D> 'Table d\'entr=C3=A9es ARP:', 'artist' =3D> 'Artiste', +'atm settings' =3D> 'R=C3=A9glages ATM', 'attemps' =3D> 'Tentatives', 'august' =3D> 'Ao=C3=BBt', 'authentication' =3D> 'Authentification :', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 4bcb550..5c39df1 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -92,7 +92,6 @@ 'admin user password has been changed' =3D> 'Beheerderswachtwoord is gewijzi= gd.', 'admin users' =3D> 'Gebruiker met beheerdersrechten.', 'administrator user password' =3D> 'Beheerderswachtwoord:', -'adsl settings' =3D> 'ADSL instellingen', 'advanced' =3D> 'Geavanceerd', 'advanced server' =3D> 'Geavanceerde server opties', 'advproxy AUTH always required' =3D> 'Authenticatie vereist voor ongelimitee= rde bronadressen.', @@ -353,6 +352,7 @@ 'are you sure' =3D> 'Weet u het zeker?', 'arp table entries' =3D> 'ARP Tabelingangen:', 'artist' =3D> 'Artiest', +'atm settings' =3D> 'ATM instellingen', 'attemps' =3D> 'Pogingen', 'attention' =3D> 'LET OP', 'august' =3D> 'Augustus', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index d6b9ab0..103e526 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -92,7 +92,6 @@ 'admin user password has been changed' =3D> 'Has=C5=82o administratora zosta= =C5=82o zmienione.', 'admin users' =3D> 'U=C5=BCytkownik prawami superu=C5=BCytkownika', 'administrator user password' =3D> 'Has=C5=82o administratora:', -'adsl settings' =3D> 'Ustawienia ADSL', 'advanced' =3D> 'Zaawansowane', 'advanced server' =3D> 'Zaawansowane ustawienia serwera', 'advproxy AUTH always required' =3D> 'Wymagaj autoryzacji dla adres=C3=B3w = =C5=BAr=C3=B3d=C5=82owych bez ogranicze=C5=84', @@ -351,6 +350,7 @@ 'are you sure' =3D> 'Jeste=C5=9B pewien?', 'arp table entries' =3D> 'Wpisy tabeli ARP:', 'artist' =3D> 'Artysta', +'atm settings' =3D> 'Ustawienia ATM', 'attemps' =3D> 'Pr=C3=B3b', 'august' =3D> 'Sierpie=C5=84', 'authentication' =3D> 'Uwierzytelnianie:', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 9ea9d62..2b680b0 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -90,7 +90,6 @@ 'admin user password has been changed' =3D> '=D0=9F=D0=B0=D1=80=D0=BE=D0=BB= =D1=8C =D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1= =8F Admin =D0=B1=D1=8B=D0=BB =D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D1=91=D0=BD.', 'admin users' =3D> '=D0=9F=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82= =D0=B5=D0=BB=D1=8C =D1=81 =D0=BF=D1=80=D0=B0=D0=B2=D0=B0=D0=BC=D0=B8 =D1=81= =D1=83=D0=BF=D0=B5=D1=80=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD=D0=B8=D1=81=D1=82=D1= =80=D0=B0=D1=82=D0=BE=D1=80=D0=B0', 'administrator user password' =3D> '=D0=9F=D0=B0=D1=80=D0=BE=D0=BB=D1=8C =D0= =BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F Admin:', -'adsl settings' =3D> '=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8= ADSL', 'advanced' =3D> '=D0=94=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8=D1=82=D0=B5=D0= =BB=D1=8C=D0=BD=D0=BE', 'advanced server' =3D> '=D0=94=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8=D1=82=D0= =B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5 =D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9= =D0=BA=D0=B8 =D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B0', 'advproxy AUTH always required' =3D> '=D0=A2=D1=80=D0=B5=D0=B1=D0=BE=D0=B2= =D0=B0=D1=82=D1=8C =D0=B0=D1=83=D1=82=D0=B5=D0=BD=D1=82=D0=B8=D1=84=D0=B8=D0= =BA=D0=B0=D1=86=D0=B8=D1=8E =D1=83 =D0=BD=D0=B5=D0=B7=D0=B0=D1=80=D0=B5=D0=B3= =D0=B8=D1=81=D1=82=D1=80=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B=D1= =85 =D0=B0=D0=B4=D1=80=D0=B5=D1=81=D0=BE=D0=B2', @@ -349,6 +348,7 @@ 'are you sure' =3D> '=D0=92=D1=8B =D1=83=D0=B2=D0=B5=D1=80=D0=B5=D0=BD=D1=8B= ?', 'arp table entries' =3D> '=D0=97=D0=B0=D0=BF=D0=B8=D1=81=D0=B8 ARP-=D1=82=D0= =B0=D0=B1=D0=BB=D0=B8=D1=86=D1=8B:', 'artist' =3D> 'Artist', +'atm settings' =3D> '=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8 = ATM', 'attemps' =3D> '=D0=9F=D0=BE=D0=BF=D1=8B=D1=82=D0=BA=D0=B8', 'august' =3D> '=D0=90=D0=B2=D0=B3=D1=83=D1=81=D1=82', 'authentication' =3D> '=D0=90=D1=83=D1=82=D0=B5=D0=BD=D1=82=D0=B8=D1=84=D0= =B8=D0=BA=D0=B0=D1=86=D0=B8=D1=8F:', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 9619793..c07d06b 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -99,7 +99,6 @@ 'admin user password has been changed' =3D> 'Y=C3=B6netici kullan=C4=B1c=C4= =B1 =C5=9Fifresi de=C4=9Fi=C5=9Ftirildi.', 'admin users' =3D> 'Yetkili kullan=C4=B1c=C4=B1 haklar=C4=B1 ile kullan=C4= =B1c=C4=B1', 'administrator user password' =3D> 'Admin kullan=C4=B1c=C4=B1 parolas=C4=B1:= ', -'adsl settings' =3D> 'ADSL ayarlar=C4=B1', 'advanced' =3D> 'Geli=C5=9Fmi=C5=9F', 'advanced server' =3D> 'Geli=C5=9Fmi=C5=9F Sunucu Se=C3=A7enekleri', 'advproxy AUTH always required' =3D> 'S=C4=B1n=C4=B1rs=C4=B1z kaynak adresle= ri i=C3=A7in kimlik do=C4=9Frulamas=C4=B1 iste', @@ -368,6 +367,7 @@ 'are you sure' =3D> 'Emin misiniz?', 'arp table entries' =3D> 'ARP tablosu girdileri:', 'artist' =3D> 'Sanat=C3=A7=C4=B1', +'atm settings' =3D> 'ATM ayarlar=C4=B1', 'attemps' =3D> 'Giri=C5=9Fim', 'attention' =3D> 'D=C4=B0KKAT', 'august' =3D> 'A=C4=9Fustos', diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/n= etworking/red index b09737e..e0c66b6 100644 --- a/src/initscripts/init.d/networking/red +++ b/src/initscripts/init.d/networking/red @@ -22,6 +22,7 @@ #Define some defaults INET_VLAN=3D7 IPTV_VLAN=3D8 +ATM_DEV=3D0 =20 eval $(/usr/local/bin/readhash /var/ipfire/main/settings) if [ "$RRDLOG" =3D=3D "" ]; then @@ -170,17 +171,17 @@ case "${1}" in =20 =20 if [ "$TYPE" =3D=3D "pppoeatm" ] || [ "$TYPE" =3D=3D "pptpatm" ]; then - PPP_NIC=3Dnas0 =09 - DEVICE=3Dnas0 + PPP_NIC=3Dnas${ATM_DEV} + DEVICE=3Dnas${ATM_DEV} boot_mesg "Createing ATM-Bridge as $PPP_NIC ..." - br2684ctl -c0 -e${ENCAP} -a0.${VPI}.${VCI} >/dev/null 2>&1 & + br2684ctl -c${ATM_DEV} -e${ENCAP} -a${ATM_DEV}.${VPI}.${VCI} >/dev/null = 2>&1 & sleep 1 =20 # use user-defined or green mac address for nas0 if [ -n "$MAC" ]; then - ip link set dev nas0 address ${MAC} + ip link set dev nas${ATM_DEV} address ${MAC} else - ip link set dev nas0 address $(cat /sys/class/net/green0/address) + ip link set dev nas${ATM_DEV} address $(cat /sys/class/net/green0/addre= ss) fi =20 if [ "$TYPE" =3D=3D "pppoeatm" ]; then hooks/post-receive -- IPFire 2.x development tree --===============1004827125952176898==--