Package: pppoeconf

Hi,

The latest patch to pppoeconf in Ubuntu might be of interest:

pppoeconf (1.6ubuntu2) breezy; urgency=low

  * Handle non-eth*-named devices and include a nic-$iface line for
  those instead of the usual ?plugin rp-pppoe.so $iface?.  Ubuntu
  #16127

 -- Tollef Fog Heen <[EMAIL PROTECTED]>  Mon, 26 Sep 2005 12:06:01
 +0200

http://bugzilla.ubuntu.com/show_bug.cgi?id=16127 is the bug report.

diff -Nru /tmp/m88FYcBp4f/pppoeconf-1.6ubuntu1/pppoeconf 
/tmp/Op8kDTrJYV/pppoeconf-1.6ubuntu2/pppoeconf
--- /tmp/m88FYcBp4f/pppoeconf-1.6ubuntu1/pppoeconf      2005-04-21 
11:23:32.000000000 +0200
+++ /tmp/Op8kDTrJYV/pppoeconf-1.6ubuntu2/pppoeconf      2005-09-26 
11:49:35.000000000 +0200
@@ -225,7 +225,13 @@
    if test "$?" = "0"; then
       if [ "$kernel_pppoe" ]; then
         # sanity check first
-       grep -q "^plugin.*rp-pppoe.so" $OPTSFILE || echo "plugin rp-pppoe.so 
$iface" >> $OPTSFILE
+       if [ "${iface##eth*}" = "" ]; then
+           # Name is eth*
+           grep -q "^plugin.*rp-pppoe.so" $OPTSFILE || echo "plugin 
rp-pppoe.so $iface" >> $OPTSFILE
+       else
+           grep -q "^plugin.*rp-pppoe.so" $OPTSFILE || echo "plugin 
rp-pppoe.so" >> $OPTSFILE
+           grep -q "^nic-$iface" $OPTSFILE || echo "nic-$iface" >> $OPTSFILE
+       fi
        # disable the pppoe tunnel command
        if grep -q '^pty' $OPTSFILE ; then
           sed -i -e 's/^pty/#pty/' $OPTSFILE
@@ -233,6 +239,7 @@

        # set the interface
        sed -i -e "s,^plugin.\+rp-pppoe.so[[:space:]]\+[[:alnum:]]*,plugin 
rp-pppoe.so $ifacenocomma," $OPTSFILE
+       sed -i -e "s,^nic-[[:alnum:]]*,nic-$ifacenocomma," $OPTSFILE
     else
        # sanity check first, fix the config file

-- 
Tollef Fog Heen                                                        ,''`.
UNIX is user friendly, it's just picky about who its friends are      : :' :
                                                                      `. `' 
                                                                        `-  


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to