Bug#728647: [PATCH 2/2] follow ifupdown and switch from net-tools' ifconfig to iproute2.

Sun, 03 Nov 2013 10:30:54 -0800 

---
 debian/changelog |  4 +++-
 debian/control   |  2 +-
 po/de.po         |  4 ++--
 po/es.po         |  4 ++--
 po/fr.po         |  4 ++--
 po/it.po         |  4 ++--
 po/ja.po         |  4 ++--
 po/old/pt.po     |  4 ++--
 po/pppoeconf.pot |  2 +-
 po/pt_BR.po      |  4 ++--
 po/pt_PT.po      |  4 ++--
 po/ru.po         |  4 ++--
 po/sl.po         |  4 ++--
 po/zh_TW.po      |  2 +-
 pppoeconf        | 15 +++++++++------
 15 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 28cc385..7200cb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 pppoeconf (1.21) UNRELEASED; urgency=low
 
-  * add missing package dependencies on ifupdown and net-tools.
+  * add missing package dependency on ifupdown.
+  * follow ifupdown and switch from net-tools' ifconfig to iproute2, adapt
+    dependencies accordingly (Closes: #XXXXXX).
 
  -- Stefan Lippers-Hollmann <s....@gmx.de>  Sun, 03 Nov 2013 16:23:07 +0100
 
diff --git a/debian/control b/debian/control
index cc99e6c..c12df54 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Standards-Version: 3.9.2
 
 Package: pppoeconf
 Architecture: all
-Depends: ${misc:Depends}, whiptail-provider | whiptail, ppp (>= 
2.4.2+20040428-2) | pppoe (>= 3.0), ppp (>= 2.4.1.uus2-4), gettext-base (>= 
0.13), sed (>= 3.95), ifupdown, net-tools
+Depends: ${misc:Depends}, whiptail-provider | whiptail, ppp (>= 
2.4.2+20040428-2) | pppoe (>= 3.0), ppp (>= 2.4.1.uus2-4), gettext-base (>= 
0.13), sed (>= 3.95), ifupdown (>= 0.7.44~), iproute2
 Recommends: locales
 Suggests: xdialog
 Description: configures PPPoE/ADSL connections
diff --git a/po/de.po b/po/de.po
index bc9a916..0815a5b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -358,10 +358,10 @@ msgstr "VERBINDUNG GESTARTET"
 #: ../pppoeconf:464
 msgid ""
 "The DSL connection has been triggered. You can use the \"plog\" command to "
-"see the status or \"ifconfig ppp0\" for general interface info."
+"see the status or \"ip addr show ppp0\" for general interface info."
 msgstr ""
 "Die DSL-Verbindung wurde ausgelöst. Sie können den Verbindungsstatus mit dem "
-"Befehl \"plog\" beobachten, sonstige Daten mit \"ifconfig ppp0\"."
+"Befehl \"plog\" beobachten, sonstige Daten mit \"ip addr show ppp0\"."
 
 #: ../pppoeconf:476
 msgid "NO INTERFACE FOUND"
diff --git a/po/es.po b/po/es.po
index 3c1b2a6..b735b64 100644
--- a/po/es.po
+++ b/po/es.po
@@ -357,10 +357,10 @@ msgstr "CONEXI
 #: ../pppoeconf:464
 msgid ""
 "The DSL connection has been triggered. You can use the \"plog\" command to "
-"see the status or \"ifconfig ppp0\" for general interface info."
+"see the status or \"ip addr show ppp0\" for general interface info."
 msgstr ""
 "Se ha lanzado la conexión DSL. Puedes utilizar el comando «plog» para ver el "
-"estado o «ifconfig ppp0» para ver información general de la interfaz."
+"estado o «ip addr show ppp0» para ver información general de la interfaz."
 
 #: ../pppoeconf:476
 msgid "NO INTERFACE FOUND"
diff --git a/po/fr.po b/po/fr.po
index ae135c7..95bcd47 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -347,10 +347,10 @@ msgstr "Connexion établie"
 #: ../pppoeconf:464
 msgid ""
 "The DSL connection has been triggered. You can use the \"plog\" command to "
-"see the status or \"ifconfig ppp0\" for general interface info."
+"see the status or \"ip addr show ppp0\" for general interface info."
 msgstr ""
 "La connexion DSL a été établie. Vous pouvez utiliser la commande « plog 
» "
-"pour en voir l'état ou « ifconfig ppp0 » pour des informations 
générales sur "
+"pour en voir l'état ou « ip addr show ppp0 » pour des informations 
générales sur "
 "l'interface."
 
 #: ../pppoeconf:476
diff --git a/po/it.po b/po/it.po
index b2d5c68..7862971 100644
--- a/po/it.po
+++ b/po/it.po
@@ -354,10 +354,10 @@ msgstr "CONNESSIONE INIZIALIZZATA"
 #: ../pppoeconf:464
 msgid ""
 "The DSL connection has been triggered. You can use the \"plog\" command to "
-"see the status or \"ifconfig ppp0\" for general interface info."
+"see the status or \"ip addr show ppp0\" for general interface info."
 msgstr ""
 "La connessione DSL Ú stata stabilita. Puoi usare il comando \"plog\" per "
-"vederne lo stato o \"ifconfig ppp0\" per informazioni generali "
+"vederne lo stato o \"ip addr show ppp0\" per informazioni generali "
 "sull'interfaccia"
 
 #: ../pppoeconf:476
diff --git a/po/ja.po b/po/ja.po
index 653e617..a3ac1bb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -318,10 +318,10 @@ msgstr "接続の初期化"
 #: ../pppoeconf:464
 msgid ""
 "The DSL connection has been triggered. You can use the \"plog\" command to "
-"see the status or \"ifconfig ppp0\" for general interface info."
+"see the status or \"ip addr show ppp0\" for general interface info."
 msgstr ""
 "DSL 接続が匕き起こされたした。状況を芋るのに \"plog\" 
コマンドを䜿ったり、䞀"
-"èˆ¬çš„ãªã‚€ãƒ³ã‚¿ãƒŒãƒ•ã‚§ã‚€ã‚¹æƒ…å ±ã‚’èŠ‹ã‚‹ã®ã« \"ifconfig ppp0\" 
を䜿ったりするこずがで"
+"èˆ¬çš„ãªã‚€ãƒ³ã‚¿ãƒŒãƒ•ã‚§ã‚€ã‚¹æƒ…å ±ã‚’èŠ‹ã‚‹ã®ã« \"ip addr show ppp0\" 
を䜿ったりするこずがで"
 "きたす。"
 
 #: ../pppoeconf:476
diff --git a/po/old/pt.po b/po/old/pt.po
index 43cedd8..b425076 100644
--- a/po/old/pt.po
+++ b/po/old/pt.po
@@ -365,10 +365,10 @@ msgstr "LIGAÇÃO INICIADA"
 #, fuzzy
 msgid ""
 "The DSL connection has been triggered. You can use the \"plog\" command to "
-"see the status or \"ifconfig ppp0\" for general interface info."
+"see the status or \"ip addr show ppp0\" for general interface info."
 msgstr ""
 "A ligação DSL foi establecida. Pode usar o comando \\\"plog\\\" para "
-"verificar o estado ou \\\"ifconfig ppp0\\\" para informações gerais do "
+"verificar o estado ou \\\"ip addr show ppp0\\\" para informações gerais do "
 "interface."
 
 #: ../../pppoeconf:396
diff --git a/po/pppoeconf.pot b/po/pppoeconf.pot
index ff063af..1b2e10d 100644
--- a/po/pppoeconf.pot
+++ b/po/pppoeconf.pot
@@ -256,7 +256,7 @@ msgstr ""
 #: ../pppoeconf:464
 msgid ""
 "The DSL connection has been triggered. You can use the \"plog\" command to "
-"see the status or \"ifconfig ppp0\" for general interface info."
+"see the status or \"ip addr show ppp0\" for general interface info."
 msgstr ""
 
 #: ../pppoeconf:476
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0c5b0c1..07656c0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -354,10 +354,10 @@ msgstr "CONEX
 #: ../pppoeconf:464
 msgid ""
 "The DSL connection has been triggered. You can use the \"plog\" command to "
-"see the status or \"ifconfig ppp0\" for general interface info."
+"see the status or \"ip addr show ppp0\" for general interface info."
 msgstr ""
 "A conexão ADSL foi iniciada. Você pode usar o comando \"plog\" para "
-"visualizar o estado ou \"ifconfig ppp0\" para informações gerais da "
+"visualizar o estado ou \"ip addr show ppp0\" para informações gerais da "
 "interface."
 
 #: ../pppoeconf:476
diff --git a/po/pt_PT.po b/po/pt_PT.po
index f76e473..8cedac9 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -352,10 +352,10 @@ msgstr "LIGAÇÃO INICIADA"
 #: ../pppoeconf:464
 msgid ""
 "The DSL connection has been triggered. You can use the \"plog\" command to "
-"see the status or \"ifconfig ppp0\" for general interface info."
+"see the status or \"ip addr show ppp0\" for general interface info."
 msgstr ""
 "A ligação DSL foi establecida. Pode usar o comando \"plog\" para verificar 
o "
-"estado ou \"ifconfig ppp0\" para informações gerais do interface."
+"estado ou \"ip addr show ppp0\" para informações gerais do interface."
 
 #: ../pppoeconf:476
 msgid "NO INTERFACE FOUND"
diff --git a/po/ru.po b/po/ru.po
index 1669c49..399f2fc 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -378,11 +378,11 @@ msgstr "НАЧАТО УСТАНОВЛЕНИЕ 
СОЕДИНЕНИЯ"
 #: ../pppoeconf:464
 msgid ""
 "The DSL connection has been triggered. You can use the \"plog\" command to "
-"see the status or \"ifconfig ppp0\" for general interface info."
+"see the status or \"ip addr show ppp0\" for general interface info."
 msgstr ""
 "БылП МачатП сПеЎОМеМОе через DSL. ЧтПбы 
пПсЌПтреть сПстПяМОе, ОспПльзуйте "
 "кПЌаМЎу \"plog\"; чтПбы увОЎеть ОМфПрЌацОю Пб 
ОМтерфейсе, ввеЎОте кПЌаМЎу "
-"\"ifconfig ppp0\"."
+"\"ip addr show ppp0\"."
 
 #: ../pppoeconf:476
 msgid "NO INTERFACE FOUND"
diff --git a/po/sl.po b/po/sl.po
index 222bc23..e565f46 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -300,10 +300,10 @@ msgstr "POVEZAVA VZPOSTAVLJENA"
 #: ../pppoeconf:464
 msgid ""
 "The DSL connection has been triggered. You can use the \"plog\" command to "
-"see the status or \"ifconfig ppp0\" for general interface info."
+"see the status or \"ip addr show ppp0\" for general interface info."
 msgstr ""
 "Povezava DSL se je sproÅŸila. Uporabite ukaz \"plog\" za prikaz stanja ali "
-"\"ifconfig ppp0\" za prikaz splošnih informacij o vmesniku."
+"\"ip addr show ppp0\" za prikaz splošnih informacij o vmesniku."
 
 #: ../pppoeconf:476
 msgid "NO INTERFACE FOUND"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7db6178..83ff117 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -302,7 +302,7 @@ msgstr "初始連線"
 #: ../pppoeconf:464
 msgid ""
 "The DSL connection has been triggered. You can use the \"plog\" command to "
-"see the status or \"ifconfig ppp0\" for general interface info."
+"see the status or \"ip addr show ppp0\" for general interface info."
 msgstr ""
 "已經啟動DSL 連線。悚可以䜿甚 \"plog\" 䜿甚䟆檢芖狀態。 
或䜿甚 \"ifconfig "
 "ppp0 \" 䟆瀏芜網路介面資蚊。 "
diff --git a/pppoeconf b/pppoeconf
index 555878b..0ee00ac 100755
--- a/pppoeconf
+++ b/pppoeconf
@@ -101,7 +101,7 @@ if test "$*" ; then
    list="$*"
    force_manual=1
 else
-   list=$( LANG=C /sbin/ifconfig -a | grep "Ethernet" | grep -v irlan | cut 
-f1 -d" " )
+   list=$( LANG=C /bin/ip -f link -o addr list | awk 
'/^[0-9]*\:.*link\/ether/{print $2}' | grep -v irlan | cut -f1 -d: )
 fi
 
 if test "$list" ; then
@@ -189,7 +189,7 @@ Webnetix:
             fi
 
             touch $TMP/pppoe.scan
-            ifconfig $iface up
+            ip link set $iface up
             ($DISCOVERY_PROGRAM $mmm -A -I $iface > $TMP/$iface.pppoe ; rm 
$TMP/pppoe.scan) &
 
             ( time=0 ; while test -f $TMP/pppoe.scan ; do time=`expr $time + 
6`; echo $time; sleep 1; done ) | $DIALOG --title "$title" --gauge "$text 
$mmode" 10 60 0
@@ -253,9 +253,12 @@ Continue with configuration?')
          # interface activation code - this sucks here, pppd plugin should do 
it as needed
          #sed -i -e "s,pre-up 
/sbin/ifconfig[[:space:]]\+[^[:space:]]\+[[:space:]]\+up.#.line.maintained.by.pppoeconf,pre-up
 /sbin/ifconfig $ifacenocomma up # line maintained by pppoeconf," $INTFILE
     # FIXME: Make sure that it gets added to correct iface stanza! (Because 
it's not always added above)
-    PATTERN_PREUP_IFACE="pre-up 
/sbin/ifconfig[[:space:]]\+[^[:space:]]\+[[:space:]]\+up.#.line.maintained.by.pppoeconf"
-    REPLACE_PREUP_IFACE="pre-up /sbin/ifconfig $ifacenocomma up # line 
maintained by pppoeconf"
-    if grep -q "$PATTERN_PREUP_IFACE" $INTFILE; then 
+    PATTERN_PREUP_IFACE_LEGACY="pre-up 
/sbin/ifconfig[[:space:]]\+[^[:space:]]\+[[:space:]]\+up.#.line.maintained.by.pppoeconf"
+    PATTERN_PREUP_IFACE="pre-up /bin/ip link 
set[[:space:]]\+[^[:space:]]\+[[:space:]]\+up.#.line.maintained.by.pppoeconf"
+    REPLACE_PREUP_IFACE="pre-up /bin/ip link set $ifacenocomma up # line 
maintained by pppoeconf"
+    if grep -q "$PATTERN_PREUP_IFACE_LEGACY" $INTFILE; then
+        sed -i -e "s,$PATTERN_PREUP_IFACE_LEGACY,$REPLACE_PREUP_IFACE," 
$INTFILE
+    elif grep -q "$PATTERN_PREUP_IFACE" $INTFILE; then
         sed -i -e "s,$PATTERN_PREUP_IFACE,$REPLACE_PREUP_IFACE," $INTFILE
     else
         sed -i -e "s,[^#]*\(iface dsl-provider.*\),\1\n$REPLACE_PREUP_IFACE," 
$INTFILE
@@ -461,7 +464,7 @@ Note that this situation is not expected and you should 
consider submitting a bu
       cd /
       pon dsl-provider
       title=$(gettext 'CONNECTION INITIATED')
-      text=$(gettext 'The DSL connection has been triggered. You can use the 
"plog" command to see the status or "ifconfig ppp0" for general interface 
info.')
+      text=$(gettext 'The DSL connection has been triggered. You can use the 
"plog" command to see the status or "ip addr show ppp0" for general interface 
info.')
       $DIALOG --title "$title" --clear --msgbox "$text" 10 60
       ;;
     1)
-- 
1.8.4.2


--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to