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 arne_f@ipfire.org 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 = $Lang::tr{'invalid vpi vpci'}; goto ERROR; } + if ($pppsettings{'ATM_DEV'} eq '') { + $errormessage = $Lang::tr{'invalid input'}; + goto ERROR; } if ( $pppsettings{'PROTOCOL'} eq '' ) { $errormessage = $Lang::tr{'invalid input'}; goto ERROR; } @@ -723,11 +726,12 @@ if ($pppsettings{'TYPE'} =~ /^(pppoeatm|pptpatm)$/)
print <<END <tr> - <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'adsl settings'}:</b></td> + <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'atm settings'}:</b></td> <tr> - + <td nowrap='nowrap'>$Lang::tr{'atm device'}</td> + <td><input type='text' size='5' name='ATM_DEV' value='$pppsettings{'ATM_DEV'}' /></td> <td> $Lang::tr{'encapsulation'}:</td> - <td colspan='2' width='30%'> + <td> <select name='ENCAP'> <option value='0' $selected{'ENCAP'}{'0'}>LLC</option> <option value='1' $selected{'ENCAP'}{'1'}>VCmux</option> @@ -735,11 +739,10 @@ print <<END </td> </tr> <tr> - <td nowrap='nowrap'>$Lang::tr{'vpi number'}</td> <td><input type='text' size='5' name='VPI' value='$pppsettings{'VPI'}' /></td> - <td align='right'>$Lang::tr{'vci number'}</td> - <td colspan='2'><input type='text' size='5' name='VCI' value='$pppsettings{'VCI'}' /></td> + <td> $Lang::tr{'vci number'}</td> + <td><input type='text' size='5' name='VCI' value='$pppsettings{'VCI'}' /></td> </tr> END ; @@ -939,6 +942,7 @@ sub initprofile $pppsettings{'ENCAP'} = '0'; $pppsettings{'VPI'} = '1'; $pppsettings{'VCI'} = '32'; + $pppsettings{'ATM_DEV'} = '0'; $pppsettings{'PPTP_PEER'} = '10.0.0.138'; $pppsettings{'PPTP_NICCFG'} = '10.0.0.140/24 broadcast 10.0.0.255'; $pppsettings{'PPTP_ROUTE'} = ''; 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' => 'Passwort für Benutzer admin wurde geändert.', 'admin users' => 'Liste der Benutzer mit Super User Rechten', 'administrator user password' => 'Passwort für Benutzer "admin":', -'adsl settings' => 'ADSL-Einstellungen', 'advanced' => 'Erweitert', 'advanced server' => 'Erweiterte Server-Optionen', 'advproxy AUTH always required' => 'Authentifizierung für uneingeschränkte Quelladressen erforderlich', @@ -366,6 +365,8 @@ 'are you sure' => 'Sind Sie sicher?', 'arp table entries' => 'Einträge der ARP-Tabelle', 'artist' => 'Künstler', +'atm device' => 'Device:', +'atm settings' => 'ATM-Einstellungen', 'attemps' => 'Versuche', 'attention' => 'ACHTUNG', 'august' => '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' => 'Admin user password has been changed.', 'admin users' => 'User with superuser rights', 'administrator user password' => 'Admin user password:', -'adsl settings' => 'ADSL settings', 'advanced' => 'Advanced', 'advanced server' => 'Advanced server options', 'advproxy AUTH always required' => 'Require authentication for unrestricted source addresses', @@ -368,6 +367,8 @@ 'are you sure' => 'Are you sure?', 'arp table entries' => 'ARP Table Entries', 'artist' => 'Artist', +'atm device' => 'Device:', +'atm settings' => 'ATM settings', 'attemps' => 'Attempts', 'attention' => 'ATTENTION', 'august' => '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' => 'El password del usuario Admin ha cambiado', 'admin users' => 'Usuario con niveles de superusuario (root)', 'administrator user password' => 'Contraseña del usuario Admin:', -'adsl settings' => 'Configuraciones ADSL', 'advanced' => 'Avanzadas', 'advanced server' => 'Opciones avanzadas de servidor', 'advproxy AUTH always required' => 'Se necesita autentificación para acceso irrestricto de direcciones de orígen', @@ -349,6 +348,7 @@ 'are you sure' => '¿Esta seguro?', 'arp table entries' => 'Tabla de entradas ARP:', 'artist' => 'Artista', +'atm settings' => 'Configuraciones ATM', 'attemps' => 'Intentos', 'august' => 'Agosto', 'authentication' => 'Autenticación', 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' => 'Le mot de passe admin a été changé.', 'admin users' => 'Utilisateur avec droits super-utilisateur', 'administrator user password' => 'Mot de passe de l'administrateur:', -'adsl settings' => 'Réglages ADSL', 'advanced' => 'Avancé', 'advanced server' => 'Options avancées du serveur', 'advproxy AUTH always required' => 'Exige l'authentification pour un accès sans restriction des adresses sources', @@ -351,6 +350,7 @@ 'are you sure' => 'Etes vous sûr ?', 'arp table entries' => 'Table d'entrées ARP:', 'artist' => 'Artiste', +'atm settings' => 'Réglages ATM', 'attemps' => 'Tentatives', 'august' => 'Août', 'authentication' => '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' => 'Beheerderswachtwoord is gewijzigd.', 'admin users' => 'Gebruiker met beheerdersrechten.', 'administrator user password' => 'Beheerderswachtwoord:', -'adsl settings' => 'ADSL instellingen', 'advanced' => 'Geavanceerd', 'advanced server' => 'Geavanceerde server opties', 'advproxy AUTH always required' => 'Authenticatie vereist voor ongelimiteerde bronadressen.', @@ -353,6 +352,7 @@ 'are you sure' => 'Weet u het zeker?', 'arp table entries' => 'ARP Tabelingangen:', 'artist' => 'Artiest', +'atm settings' => 'ATM instellingen', 'attemps' => 'Pogingen', 'attention' => 'LET OP', 'august' => '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' => 'Hasło administratora zostało zmienione.', 'admin users' => 'Użytkownik prawami superużytkownika', 'administrator user password' => 'Hasło administratora:', -'adsl settings' => 'Ustawienia ADSL', 'advanced' => 'Zaawansowane', 'advanced server' => 'Zaawansowane ustawienia serwera', 'advproxy AUTH always required' => 'Wymagaj autoryzacji dla adresów źródłowych bez ograniczeń', @@ -351,6 +350,7 @@ 'are you sure' => 'Jesteś pewien?', 'arp table entries' => 'Wpisy tabeli ARP:', 'artist' => 'Artysta', +'atm settings' => 'Ustawienia ATM', 'attemps' => 'Prób', 'august' => 'Sierpień', 'authentication' => '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' => 'Пароль пользователя Admin был изменён.', 'admin users' => 'Пользователь с правами суперадминистратора', 'administrator user password' => 'Пароль пользователя Admin:', -'adsl settings' => 'Настройки ADSL', 'advanced' => 'Дополнительно', 'advanced server' => 'Дополнительные настройки сервера', 'advproxy AUTH always required' => 'Требовать аутентификацию у незарегистрированных адресов', @@ -349,6 +348,7 @@ 'are you sure' => 'Вы уверены?', 'arp table entries' => 'Записи ARP-таблицы:', 'artist' => 'Artist', +'atm settings' => 'Настройки ATM', 'attemps' => 'Попытки', 'august' => 'Август', 'authentication' => 'Аутентификация:', 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' => 'Yönetici kullanıcı şifresi değiştirildi.', 'admin users' => 'Yetkili kullanıcı hakları ile kullanıcı', 'administrator user password' => 'Admin kullanıcı parolası:', -'adsl settings' => 'ADSL ayarları', 'advanced' => 'Gelişmiş', 'advanced server' => 'Gelişmiş Sunucu Seçenekleri', 'advproxy AUTH always required' => 'Sınırsız kaynak adresleri için kimlik doğrulaması iste', @@ -368,6 +367,7 @@ 'are you sure' => 'Emin misiniz?', 'arp table entries' => 'ARP tablosu girdileri:', 'artist' => 'Sanatçı', +'atm settings' => 'ATM ayarları', 'attemps' => 'Girişim', 'attention' => 'DİKKAT', 'august' => 'Ağustos', diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/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=7 IPTV_VLAN=8 +ATM_DEV=0
eval $(/usr/local/bin/readhash /var/ipfire/main/settings) if [ "$RRDLOG" == "" ]; then @@ -170,17 +171,17 @@ case "${1}" in
if [ "$TYPE" == "pppoeatm" ] || [ "$TYPE" == "pptpatm" ]; then - PPP_NIC=nas0 - DEVICE=nas0 + PPP_NIC=nas${ATM_DEV} + DEVICE=nas${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
# 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/address) fi
if [ "$TYPE" == "pppoeatm" ]; then
hooks/post-receive -- IPFire 2.x development tree