r5050 - in trunk: BOOK BOOK/connect/other BOOK/introduction/welcome patches

igor at linuxfromscratch.org igor at linuxfromscratch.org
Sat Sep 10 05:56:02 PDT 2005


Author: igor
Date: 2005-09-10 06:56:01 -0600 (Sat, 10 Sep 2005)
New Revision: 5050

Added:
   trunk/patches/rp-pppoe-3.6-iproute2-1.patch
Removed:
   trunk/patches/rp-pppoe-3.5-iproute2-1.patch
Modified:
   trunk/BOOK/connect/other/pppoe.xml
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Updated to RP-PPPoE-3.6.

Modified: trunk/BOOK/connect/other/pppoe.xml
===================================================================
--- trunk/BOOK/connect/other/pppoe.xml	2005-09-10 11:34:35 UTC (rev 5049)
+++ trunk/BOOK/connect/other/pppoe.xml	2005-09-10 12:56:01 UTC (rev 5050)
@@ -5,9 +5,9 @@
   %general-entities;
 
   <!ENTITY pppoe-download-http "http://www.roaringpenguin.com/penguin/pppoe/rp-pppoe-&pppoe-version;.tar.gz">
-  <!ENTITY pppoe-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/rp-pppoe-&pppoe-version;.tar.gz">
-  <!ENTITY pppoe-md5sum        "97972f8f8f6a3ab9b7070333a6a29c4b">
-  <!ENTITY pppoe-size          "185 KB">
+  <!ENTITY pppoe-download-ftp  " ">
+  <!ENTITY pppoe-md5sum        "944bae296796144e1728188a44d18cbd">
+  <!ENTITY pppoe-size          "207 KB">
   <!ENTITY pppoe-buildsize     "2.2 MB">
   <!ENTITY pppoe-time          "0.05 SBU">
 ]>
@@ -83,10 +83,10 @@
       <primary sortas="d-Kernel-mode-PPPoE">Kernel-mode PPPoE</primary>
     </indexterm>
 
-    <para>Fix the location of the logger executable in several ADSL scripts:</para>
+    <para>Fix the location of the logger executable in several PPPoE scripts:</para>
 
 <screen><userinput>sed -i s%/usr/bin/logger%/bin/logger% \
-    scripts/adsl-{connect,setup,stop}.in</userinput></screen>
+    scripts/pppoe-{connect,setup,stop}.in</userinput></screen>
 
     <para>Install <application>RP-PPPoE</application> by running the following
     commands:</para>
@@ -110,7 +110,7 @@
     package into the <filename class="directory">/usr</filename> prefix.  You
     can optionally use the <command>go</command> script in the root of the
     source tree to run the same commands, which are then immediately followed
-    by the <command>adsl-setup</command> script.</para>
+    by the <command>pppoe-setup</command> script.</para>
 
   </sect2>
 
@@ -162,7 +162,7 @@
       <title>Configuration Information</title>
 
       <para>To configure <application>RP-PPPoE</application> after installation,
-      you should run the <command>adsl-setup</command> script.</para>
+      you should run the <command>pppoe-setup</command> script.</para>
 
       <para>When configuring your connection, you will need to have your
       ISP's nameserver information available, as well as your
@@ -171,7 +171,7 @@
       charge by the minute, it is usually good to have a bootscript handle the
       connection for you.  You can, of course, choose not to install the
       following script, and start your connection manually with the
-      <command>adsl-start</command> script.</para>
+      <command>pppoe-start</command> script.</para>
 
       <para id="pppoe-init"><emphasis>Optionally</emphasis> install the
       <filename>/etc/sysconfig/network-devices/services/pppoe</filename> service
@@ -223,7 +223,7 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>adsl-connect, adsl-setup, adsl-start, adsl-status, adsl-stop, pppoe,
+        <seg>pppoe-connect, pppoe-setup, pppoe-start, pppoe-status, pppoe-stop, pppoe,
         pppoe-relay, pppoe-server and pppoe-sniff</seg>
         <seg>None</seg>
         <seg>/etc/ppp/plugins and /usr/share/doc/rp-pppoe-&pppoe-version;</seg>
@@ -235,56 +235,56 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="adsl-connect">
-        <term><command>adsl-connect</command></term>
+      <varlistentry id="pppoe-connect">
+        <term><command>pppoe-connect</command></term>
         <listitem>
-          <para>is a shell script which manages an ADSL
+          <para>is a shell script which manages an PPPoE
           connection using the user-space PPPoE client.</para>
-          <indexterm zone="pppoe adsl-connect">
-            <primary sortas="b-adsl-connect">adsl-connect</primary>
+          <indexterm zone="pppoe pppoe-connect">
+            <primary sortas="b-pppoe-connect">pppoe-connect</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="adsl-setup">
-        <term><command>adsl-setup</command></term>
+      <varlistentry id="pppoe-setup">
+        <term><command>pppoe-setup</command></term>
         <listitem>
           <para>is a script for configuring the client. Configuration is
           then stored in <filename>/etc/ppp/pppoe.conf</filename>.</para>
-          <indexterm zone="pppoe adsl-setup">
-            <primary sortas="b-adsl-setup">adsl-setup</primary>
+          <indexterm zone="pppoe pppoe-setup">
+            <primary sortas="b-pppoe-setup">pppoe-setup</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="adsl-start">
-        <term><command>adsl-start</command></term>
+      <varlistentry id="pppoe-start">
+        <term><command>pppoe-start</command></term>
         <listitem>
           <para>starts the client using the options specified in
           <filename>/etc/ppp/pppoe.conf</filename>.</para>
-          <indexterm zone="pppoe adsl-start">
-            <primary sortas="b-adsl-start">adsl-start</primary>
+          <indexterm zone="pppoe pppoe-start">
+            <primary sortas="b-pppoe-start">pppoe-start</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="adsl-status">
-        <term><command>adsl-status</command></term>
+      <varlistentry id="pppoe-status">
+        <term><command>pppoe-status</command></term>
         <listitem>
-          <para>displays the status of the ADSL
+          <para>displays the status of the PPPoE
           connection.</para>
-          <indexterm zone="pppoe adsl-status">
-            <primary sortas="b-adsl-status">adsl-status</primary>
+          <indexterm zone="pppoe pppoe-status">
+            <primary sortas="b-pppoe-status">pppoe-status</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="adsl-stop">
-        <term><command>adsl-stop</command></term>
+      <varlistentry id="pppoe-stop">
+        <term><command>pppoe-stop</command></term>
         <listitem>
           <para>stops the client.</para>
-          <indexterm zone="pppoe adsl-stop">
-            <primary sortas="b-adsl-stop">adsl-stop</primary>
+          <indexterm zone="pppoe pppoe-stop">
+            <primary sortas="b-pppoe-stop">pppoe-stop</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-09-10 11:34:35 UTC (rev 5049)
+++ trunk/BOOK/general.ent	2005-09-10 12:56:01 UTC (rev 5050)
@@ -223,7 +223,7 @@
 <!ENTITY dhcpcd-version               "1.3.22-pl4">
 
 <!-- Chapter 15 -->
-<!ENTITY pppoe-version                "3.5">
+<!ENTITY pppoe-version                "3.6">
 
 <!-- Chapter 16 -->
 <!ENTITY curl-version                 "7.14.1">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-09-10 11:34:35 UTC (rev 5049)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-09-10 12:56:01 UTC (rev 5050)
@@ -45,6 +45,9 @@
       <para>September 10th, 2005</para>
       <itemizedlist>
         <listitem>
+          <para>[igor] - Updated to RP-PPPoE-3.6.</para>
+        </listitem>
+        <listitem>
           <para>[dj] - Added a GCC-4 patch and updated 'fixed_paths' 
           patch in JDK source build instructions.</para>
         </listitem>

Deleted: trunk/patches/rp-pppoe-3.5-iproute2-1.patch
===================================================================
--- trunk/patches/rp-pppoe-3.5-iproute2-1.patch	2005-09-10 11:34:35 UTC (rev 5049)
+++ trunk/patches/rp-pppoe-3.5-iproute2-1.patch	2005-09-10 12:56:01 UTC (rev 5050)
@@ -1,242 +0,0 @@
-Submitted By: DJ Lucas (dj at linuxfromscratch dot org)
-Date: 2004-08-30
-Initial Package Version: 3.5
-Origin: Self
-Description: Removed dependancy on net-tools in favor of utils from iproute2.
-Upstream Status:  Not submitted
-
-$LastChangedBy$
-$Date$
-
-diff -Naur rp-pppoe-3.5-orig/doc/CHANGES rp-pppoe-3.5/doc/CHANGES
---- rp-pppoe-3.5-orig/doc/CHANGES	2002-07-08 09:38:24.000000000 -0500
-+++ rp-pppoe-3.5/doc/CHANGES	2004-08-30 22:20:13.931535304 -0500
-@@ -1,5 +1,11 @@
- # LIC: GPL
- 
-+Changes from Version 3.5 to current:
-+
-+- Adapted scripts to make use of the utilities included with the iproute2
-+  package as opposed to the ones included with net-tools.
-+  Does this break 2.0.x kernels?
-+
- Changes from Version 3.4 to 3.5:
- 
- - Fixes for compilation on Solaris.
-diff -Naur rp-pppoe-3.5-orig/doc/HOW-TO-CONNECT rp-pppoe-3.5/doc/HOW-TO-CONNECT
---- rp-pppoe-3.5-orig/doc/HOW-TO-CONNECT	2002-07-08 09:38:24.000000000 -0500
-+++ rp-pppoe-3.5/doc/HOW-TO-CONNECT	2004-08-30 22:17:19.436062648 -0500
-@@ -21,14 +21,15 @@
- of this document.  However, if the card is the only Ethernet card in
- the system, executing:
- 
--	ifconfig eth0
-+	ip link show eth0
- 
- should display something like this:
- 
--	eth0      Link encap:Ethernet  HWaddr 00:60:67:62:31:D4  
-+3: eth0: <BROADCAST,MULTICAST> mtu 1500 qdisc pfifo_fast qlen 1000
-+    link/ether 00:10:b5:d1:ea:fc brd ff:ff:ff:ff:ff:ff
- 
--plust some more lines.  Your HWaddr will be different.  As long as you see
--the HWaddr line, your card should be working.
-+Your second line will most definately be different.  As long as you see
-+the link/ether line, your card should be working.
- 
- DO NOT assign an IP address to the Ethernet card.  DO NOT configure the
- card to come up at boot time.
-@@ -119,7 +120,7 @@
- 
- If you want to manually configure the LAN hosts, here's how:
- 
--In Linux, use: "ifconfig eth0 mtu 1452".  For best results, put this
-+In Linux, use: "ip link set eth0 mtu 1452".  For best results, put this
- in an /etc/rc.d/rc.local script.
- 
- For Windows, machines, see http://lan.cns.ksu.edu/OS/WIN95/slip95.htm.
-@@ -147,9 +148,9 @@
- 
- Well, I can't really help you here.  To use these instructions, you must
- have Linux working to the point where it recognizes your Ethernet card.
--If you type "ifconfig ethx" and you get back a HWAddr value, your Ethernet
--card is probably OK.  But I really can't help with hardware configuration
--issues.
-+If you type "ip link show ethx" and you get back a hardware address value 
-+in the line that begins with link/ether, your Ethernet card is probably OK.  
-+But I really can't help with hardware configuration issues.
- 
- -----------------------------------------------------------------------------
- B) Connection seems to come up, but I can't browse the web or ping anything
-@@ -223,9 +224,9 @@
- address.  For example, if eth0 is your internal LAN card and eth1 goes to
- the DSL modem, do something like this:
- 
--	ifconfig eth1 10.0.0.1 netmask 255.255.255.0
-+	ip link set eth1 10.0.0.1/24
- 
--(You may have to choose a different IP address; experiment.)
-+(You may have to choose a different IP address and prefix; experiment.)
- -----------------------------------------------------------------------------
- K) How can I run a script every time I connect and get a new IP address?
- 
-@@ -261,8 +262,8 @@
- connected to the ADSL modem.  You might want to add these lines in
- adsl-connect:
- 
--	ifconfig ethx down
--	ifconfig ethx up mtu 1500
-+	ip link set ethx down
-+	ip link set  ethx up mtu 1500
- 
- which should reset things to sane values.
- 
-diff -Naur rp-pppoe-3.5-orig/gui/tkpppoe.in rp-pppoe-3.5/gui/tkpppoe.in
---- rp-pppoe-3.5-orig/gui/tkpppoe.in	2002-07-08 09:38:24.000000000 -0500
-+++ rp-pppoe-3.5/gui/tkpppoe.in	2004-08-30 21:04:07.736702432 -0500
-@@ -1573,7 +1573,7 @@
- #***********************************************************************
- proc GetEthernetInterfaces {} {
-     set ifs {}
--    set fp [open "|/sbin/ifconfig" "r"]
-+    set fp [open "|/sbin/ip" "r"]
-     while {[gets $fp line] >= 0} {
- 	if {[regexp {^eth[0-9]+} $line eth]} {
- 	    lappend ifs $eth
-diff -Naur rp-pppoe-3.5-orig/man/pppoe-sniff.8 rp-pppoe-3.5/man/pppoe-sniff.8
---- rp-pppoe-3.5-orig/man/pppoe-sniff.8	2002-07-08 09:38:24.000000000 -0500
-+++ rp-pppoe-3.5/man/pppoe-sniff.8	2004-08-30 21:06:06.050715968 -0500
-@@ -32,7 +32,7 @@
- for example, type these commands:
- 
- .nf
--	ifconfig eth0 promisc
-+	ip link set eth0 promisc on
- 	pppoe-sniff -I eth0
- .fi
- 
-@@ -49,7 +49,7 @@
- remember to turn off promiscuous mode:
- 
- .nf
--	ifconfig eth0 -promisc
-+	ip link set eth0 promisc on
- .fi
- 
- .SH OPTIONS
-diff -Naur rp-pppoe-3.5-orig/scripts/adsl-connect.in rp-pppoe-3.5/scripts/adsl-connect.in
---- rp-pppoe-3.5-orig/scripts/adsl-connect.in	2002-07-08 09:38:24.000000000 -0500
-+++ rp-pppoe-3.5/scripts/adsl-connect.in	2004-08-30 21:19:42.593582584 -0500
-@@ -28,7 +28,7 @@
- localstatedir=/var
- 
- # Paths to programs
--IFCONFIG=/sbin/ifconfig
-+IPBIN=/sbin/ip
- PPPD=@PPPD@
- SETSID=@SETSID@
- PPPOE=@sbindir@/pppoe
-@@ -115,7 +115,7 @@
- # fails on some *BSD's, so we'll only do it under Linux
- 
- if test `uname -s` = Linux ; then
--    $IFCONFIG $ETH up mtu 1500
-+    $IPBIN link set $ETH up mtu 1500
-     # For 2.4 kernels.  Will fail on 2.2.x, but who cares?
-     modprobe ppp_generic > /dev/null 2>&1
-     modprobe ppp_async > /dev/null 2>&1
-diff -Naur rp-pppoe-3.5-orig/scripts/adsl-setup.in rp-pppoe-3.5/scripts/adsl-setup.in
---- rp-pppoe-3.5-orig/scripts/adsl-setup.in	2002-07-08 09:38:24.000000000 -0500
-+++ rp-pppoe-3.5/scripts/adsl-setup.in	2004-08-30 21:17:41.196037816 -0500
-@@ -17,7 +17,7 @@
- exec_prefix=@exec_prefix@
- 
- # Paths to programs
--IFCONFIG=/sbin/ifconfig
-+IPBIN=/sbin/ip
- PPPD=@PPPD@
- PPPOE=@sbindir@/pppoe
- ECHO=@ECHO@
-@@ -94,7 +94,7 @@
- 
-     # Under Linux, "fix" the default interface if eth1 is not available
-     if test `uname -s` = "Linux" ; then
--	$IFCONFIG $ETH > /dev/null 2>&1 || ETH=eth0
-+	$IPBIN link show $ETH > /dev/null 2>&1 || ETH=eth0
-     fi
-     $ECHO ""
-     $ECHO "INTERFACE"
-diff -Naur rp-pppoe-3.5-orig/scripts/adsl-start.in rp-pppoe-3.5/scripts/adsl-start.in
---- rp-pppoe-3.5-orig/scripts/adsl-start.in	2002-07-08 09:38:24.000000000 -0500
-+++ rp-pppoe-3.5/scripts/adsl-start.in	2004-08-30 21:50:26.559257192 -0500
-@@ -29,7 +29,7 @@
- # Paths to programs
- CONNECT=@sbindir@/adsl-connect
- ECHO=@ECHO@
--IFCONFIG=/sbin/ifconfig
-+IPBIN=/sbin/ip
- 
- # Set to "C" locale so we can parse messages from commands
- LANG=C
-@@ -69,8 +69,8 @@
-     $ECHO "* interfaces.  The one you chose for PPPoE should contain the words:" >> $DEBUG
-     $ECHO "* 'UP' and 'RUNNING'.  If it does not, you probably have an Ethernet" >> $DEBUG
-     $ECHO "* driver problem." >> $DEBUG
--    $ECHO "Output of ifconfig -a" >> $DEBUG
--    $IFCONFIG -a >> $DEBUG
-+    $ECHO "Output of 'ip link show'" >> $DEBUG
-+    $IPBIN link show >> $DEBUG
-     $ECHO "---------------------------------------------" >> $DEBUG
-     if [ "`uname -s`" = "Linux" ] ; then
-         $ECHO "* The following section contains information about kernel modules" >> $DEBUG
-@@ -85,8 +85,8 @@
-     $ECHO "* have defined a default route and gateway, and pppd will" >> $DEBUG
-     $ECHO "* not create a default route using your ISP.  Try getting" >> $DEBUG
-     $ECHO "* rid of this route." >> $DEBUG
--    $ECHO "Output of netstat -n -r" >> $DEBUG
--    netstat -n -r >> $DEBUG
-+    $ECHO "Output of ip route" >> $DEBUG
-+    $IPBIN route >> $DEBUG
-     $ECHO "---------------------------------------------" >> $DEBUG
-     $ECHO "Contents of /etc/resolv.conf" >> $DEBUG
-     $ECHO "* The following section lists DNS setup." >> $DEBUG
-diff -Naur rp-pppoe-3.5-orig/scripts/adsl-status rp-pppoe-3.5/scripts/adsl-status
---- rp-pppoe-3.5-orig/scripts/adsl-status	2002-07-08 09:38:24.000000000 -0500
-+++ rp-pppoe-3.5/scripts/adsl-status	2004-08-30 21:52:58.461164592 -0500
-@@ -66,14 +66,14 @@
- 	PID=`cat $i`
- 	if [ "$PID" = "$PPPD_PID" ] ; then
- 	    IF=`basename $i .pid`
--	    netstat -rn | grep " ${IF}\$" > /dev/null
--	    # /sbin/ifconfig $IF | grep "UP.*POINTOPOINT" > /dev/null
-+	    ip route | grep "dev ${IF}" > /dev/null
-+	    # /sbin/ip link show $IF | grep "UP.*POINTOPOINT" > /dev/null
- 	    if [ "$?" != "0" ] ; then
- 		echo "adsl-status: Link is attached to $IF, but $IF is down"
- 		exit 1
- 	    fi
- 	    echo "adsl-status: Link is up and running on interface $IF"
--	    /sbin/ifconfig $IF
-+	    /sbin/ip link show $IF
- 	    exit 0
- 	fi
-     fi
-@@ -81,4 +81,4 @@
- 
- echo "adsl-status: Link is down -- could not find interface corresponding to"
- echo "pppd pid $PPPD_PID"
--exit 1
-\ No newline at end of file
-+exit 1
-diff -Naur rp-pppoe-3.5-orig/src/pppoe-sniff.c rp-pppoe-3.5/src/pppoe-sniff.c
---- rp-pppoe-3.5-orig/src/pppoe-sniff.c	2002-07-08 09:38:24.000000000 -0500
-+++ rp-pppoe-3.5/src/pppoe-sniff.c	2004-08-30 21:54:47.247626536 -0500
-@@ -194,7 +194,7 @@
- 
- #endif
- 
--    /* We assume interface is in promiscuous mode -- use ifconfig to
-+    /* We assume interface is in promiscuous mode -- use 'ip link show' to
-        ensure this */
-     fprintf(stderr, "Sniffing for PADR.  Start your connection on another machine...\n");
-     while (!SeenPADR) {

Copied: trunk/patches/rp-pppoe-3.6-iproute2-1.patch (from rev 5047, trunk/patches/rp-pppoe-3.5-iproute2-1.patch)
===================================================================
--- trunk/patches/rp-pppoe-3.5-iproute2-1.patch	2005-09-10 06:48:04 UTC (rev 5047)
+++ trunk/patches/rp-pppoe-3.6-iproute2-1.patch	2005-09-10 12:56:01 UTC (rev 5050)
@@ -0,0 +1,242 @@
+Submitted By: DJ Lucas (dj at linuxfromscratch dot org)
+Date: 2004-08-30
+Initial Package Version: 3.5
+Origin: Self
+Description: Removed dependancy on net-tools in favor of utils from iproute2.
+Upstream Status:  Not submitted
+
+$LastChangedBy$
+$Date$
+
+diff -Naur rp-pppoe-3.5-orig/doc/CHANGES rp-pppoe-3.5/doc/CHANGES
+--- rp-pppoe-3.5-orig/doc/CHANGES	2002-07-08 09:38:24.000000000 -0500
++++ rp-pppoe-3.5/doc/CHANGES	2004-08-30 22:20:13.931535304 -0500
+@@ -1,5 +1,11 @@
+ # LIC: GPL
+ 
++Changes from Version 3.5 to current:
++
++- Adapted scripts to make use of the utilities included with the iproute2
++  package as opposed to the ones included with net-tools.
++  Does this break 2.0.x kernels?
++
+ Changes from Version 3.4 to 3.5:
+ 
+ - Fixes for compilation on Solaris.
+diff -Naur rp-pppoe-3.5-orig/doc/HOW-TO-CONNECT rp-pppoe-3.5/doc/HOW-TO-CONNECT
+--- rp-pppoe-3.5-orig/doc/HOW-TO-CONNECT	2002-07-08 09:38:24.000000000 -0500
++++ rp-pppoe-3.5/doc/HOW-TO-CONNECT	2004-08-30 22:17:19.436062648 -0500
+@@ -21,14 +21,15 @@
+ of this document.  However, if the card is the only Ethernet card in
+ the system, executing:
+ 
+-	ifconfig eth0
++	ip link show eth0
+ 
+ should display something like this:
+ 
+-	eth0      Link encap:Ethernet  HWaddr 00:60:67:62:31:D4  
++3: eth0: <BROADCAST,MULTICAST> mtu 1500 qdisc pfifo_fast qlen 1000
++    link/ether 00:10:b5:d1:ea:fc brd ff:ff:ff:ff:ff:ff
+ 
+-plust some more lines.  Your HWaddr will be different.  As long as you see
+-the HWaddr line, your card should be working.
++Your second line will most definately be different.  As long as you see
++the link/ether line, your card should be working.
+ 
+ DO NOT assign an IP address to the Ethernet card.  DO NOT configure the
+ card to come up at boot time.
+@@ -119,7 +120,7 @@
+ 
+ If you want to manually configure the LAN hosts, here's how:
+ 
+-In Linux, use: "ifconfig eth0 mtu 1452".  For best results, put this
++In Linux, use: "ip link set eth0 mtu 1452".  For best results, put this
+ in an /etc/rc.d/rc.local script.
+ 
+ For Windows, machines, see http://lan.cns.ksu.edu/OS/WIN95/slip95.htm.
+@@ -147,9 +148,9 @@
+ 
+ Well, I can't really help you here.  To use these instructions, you must
+ have Linux working to the point where it recognizes your Ethernet card.
+-If you type "ifconfig ethx" and you get back a HWAddr value, your Ethernet
+-card is probably OK.  But I really can't help with hardware configuration
+-issues.
++If you type "ip link show ethx" and you get back a hardware address value 
++in the line that begins with link/ether, your Ethernet card is probably OK.  
++But I really can't help with hardware configuration issues.
+ 
+ -----------------------------------------------------------------------------
+ B) Connection seems to come up, but I can't browse the web or ping anything
+@@ -223,9 +224,9 @@
+ address.  For example, if eth0 is your internal LAN card and eth1 goes to
+ the DSL modem, do something like this:
+ 
+-	ifconfig eth1 10.0.0.1 netmask 255.255.255.0
++	ip link set eth1 10.0.0.1/24
+ 
+-(You may have to choose a different IP address; experiment.)
++(You may have to choose a different IP address and prefix; experiment.)
+ -----------------------------------------------------------------------------
+ K) How can I run a script every time I connect and get a new IP address?
+ 
+@@ -261,8 +262,8 @@
+ connected to the ADSL modem.  You might want to add these lines in
+ pppoe-connect:
+ 
+-	ifconfig ethx down
+-	ifconfig ethx up mtu 1500
++	ip link set ethx down
++	ip link set  ethx up mtu 1500
+ 
+ which should reset things to sane values.
+ 
+diff -Naur rp-pppoe-3.5-orig/gui/tkpppoe.in rp-pppoe-3.5/gui/tkpppoe.in
+--- rp-pppoe-3.5-orig/gui/tkpppoe.in	2002-07-08 09:38:24.000000000 -0500
++++ rp-pppoe-3.5/gui/tkpppoe.in	2004-08-30 21:04:07.736702432 -0500
+@@ -1573,7 +1573,7 @@
+ #***********************************************************************
+ proc GetEthernetInterfaces {} {
+     set ifs {}
+-    set fp [open "|/sbin/ifconfig" "r"]
++    set fp [open "|/sbin/ip" "r"]
+     while {[gets $fp line] >= 0} {
+ 	if {[regexp {^eth[0-9]+} $line eth]} {
+ 	    lappend ifs $eth
+diff -Naur rp-pppoe-3.5-orig/man/pppoe-sniff.8 rp-pppoe-3.5/man/pppoe-sniff.8
+--- rp-pppoe-3.5-orig/man/pppoe-sniff.8	2002-07-08 09:38:24.000000000 -0500
++++ rp-pppoe-3.5/man/pppoe-sniff.8	2004-08-30 21:06:06.050715968 -0500
+@@ -32,7 +32,7 @@
+ for example, type these commands:
+ 
+ .nf
+-	ifconfig eth0 promisc
++	ip link set eth0 promisc on
+ 	pppoe-sniff -I eth0
+ .fi
+ 
+@@ -49,7 +49,7 @@
+ remember to turn off promiscuous mode:
+ 
+ .nf
+-	ifconfig eth0 -promisc
++	ip link set eth0 promisc on
+ .fi
+ 
+ .SH OPTIONS
+diff -Naur rp-pppoe-3.5-orig/scripts/pppoe-connect.in rp-pppoe-3.5/scripts/pppoe-connect.in
+--- rp-pppoe-3.5-orig/scripts/pppoe-connect.in	2002-07-08 09:38:24.000000000 -0500
++++ rp-pppoe-3.5/scripts/pppoe-connect.in	2004-08-30 21:19:42.593582584 -0500
+@@ -28,7 +28,7 @@
+ localstatedir=/var
+ 
+ # Paths to programs
+-IFCONFIG=/sbin/ifconfig
++IPBIN=/sbin/ip
+ PPPD=@PPPD@
+ SETSID=@SETSID@
+ PPPOE=@sbindir@/pppoe
+@@ -115,7 +115,7 @@
+ # fails on some *BSD's, so we'll only do it under Linux
+ 
+ if test `uname -s` = Linux ; then
+-    $IFCONFIG $ETH up mtu 1500
++    $IPBIN link set $ETH up mtu 1500
+     # For 2.4 kernels.  Will fail on 2.2.x, but who cares?
+     modprobe ppp_generic > /dev/null 2>&1
+     modprobe ppp_async > /dev/null 2>&1
+diff -Naur rp-pppoe-3.5-orig/scripts/pppoe-setup.in rp-pppoe-3.5/scripts/pppoe-setup.in
+--- rp-pppoe-3.5-orig/scripts/pppoe-setup.in	2002-07-08 09:38:24.000000000 -0500
++++ rp-pppoe-3.5/scripts/pppoe-setup.in	2004-08-30 21:17:41.196037816 -0500
+@@ -17,7 +17,7 @@
+ exec_prefix=@exec_prefix@
+ 
+ # Paths to programs
+-IFCONFIG=/sbin/ifconfig
++IPBIN=/sbin/ip
+ PPPD=@PPPD@
+ PPPOE=@sbindir@/pppoe
+ ECHO=@ECHO@
+@@ -94,7 +94,7 @@
+ 
+     # Under Linux, "fix" the default interface if eth1 is not available
+     if test `uname -s` = "Linux" ; then
+-	$IFCONFIG $ETH > /dev/null 2>&1 || ETH=eth0
++	$IPBIN link show $ETH > /dev/null 2>&1 || ETH=eth0
+     fi
+     $ECHO ""
+     $ECHO "INTERFACE"
+diff -Naur rp-pppoe-3.5-orig/scripts/pppoe-start.in rp-pppoe-3.5/scripts/pppoe-start.in
+--- rp-pppoe-3.5-orig/scripts/pppoe-start.in	2002-07-08 09:38:24.000000000 -0500
++++ rp-pppoe-3.5/scripts/pppoe-start.in	2004-08-30 21:50:26.559257192 -0500
+@@ -29,7 +29,7 @@
+ # Paths to programs
+ CONNECT=@sbindir@/pppoe-connect
+ ECHO=@ECHO@
+-IFCONFIG=/sbin/ifconfig
++IPBIN=/sbin/ip
+ 
+ # Set to "C" locale so we can parse messages from commands
+ LANG=C
+@@ -69,8 +69,8 @@
+     $ECHO "* interfaces.  The one you chose for PPPoE should contain the words:" >> $DEBUG
+     $ECHO "* 'UP' and 'RUNNING'.  If it does not, you probably have an Ethernet" >> $DEBUG
+     $ECHO "* driver problem." >> $DEBUG
+-    $ECHO "Output of ifconfig -a" >> $DEBUG
+-    $IFCONFIG -a >> $DEBUG
++    $ECHO "Output of 'ip link show'" >> $DEBUG
++    $IPBIN link show >> $DEBUG
+     $ECHO "---------------------------------------------" >> $DEBUG
+     if [ "`uname -s`" = "Linux" ] ; then
+         $ECHO "* The following section contains information about kernel modules" >> $DEBUG
+@@ -85,8 +85,8 @@
+     $ECHO "* have defined a default route and gateway, and pppd will" >> $DEBUG
+     $ECHO "* not create a default route using your ISP.  Try getting" >> $DEBUG
+     $ECHO "* rid of this route." >> $DEBUG
+-    $ECHO "Output of netstat -n -r" >> $DEBUG
+-    netstat -n -r >> $DEBUG
++    $ECHO "Output of ip route" >> $DEBUG
++    $IPBIN route >> $DEBUG
+     $ECHO "---------------------------------------------" >> $DEBUG
+     $ECHO "Contents of /etc/resolv.conf" >> $DEBUG
+     $ECHO "* The following section lists DNS setup." >> $DEBUG
+diff -Naur rp-pppoe-3.5-orig/scripts/pppoe-status rp-pppoe-3.5/scripts/pppoe-status
+--- rp-pppoe-3.5-orig/scripts/pppoe-status	2002-07-08 09:38:24.000000000 -0500
++++ rp-pppoe-3.5/scripts/pppoe-status	2004-08-30 21:52:58.461164592 -0500
+@@ -66,14 +66,14 @@
+ 	PID=`cat $i`
+ 	if [ "$PID" = "$PPPD_PID" ] ; then
+ 	    IF=`basename $i .pid`
+-	    netstat -rn | grep " ${IF}\$" > /dev/null
+-	    # /sbin/ifconfig $IF | grep "UP.*POINTOPOINT" > /dev/null
++	    ip route | grep "dev ${IF}" > /dev/null
++	    # /sbin/ip link show $IF | grep "UP.*POINTOPOINT" > /dev/null
+ 	    if [ "$?" != "0" ] ; then
+ 		echo "pppoe-status: Link is attached to $IF, but $IF is down"
+ 		exit 1
+ 	    fi
+ 	    echo "pppoe-status: Link is up and running on interface $IF"
+-	    /sbin/ifconfig $IF
++	    /sbin/ip link show $IF
+ 	    exit 0
+ 	fi
+     fi
+@@ -81,4 +81,4 @@
+ 
+ echo "pppoe-status: Link is down -- could not find interface corresponding to"
+ echo "pppd pid $PPPD_PID"
+-exit 1
+\ No newline at end of file
++exit 1
+diff -Naur rp-pppoe-3.5-orig/src/pppoe-sniff.c rp-pppoe-3.5/src/pppoe-sniff.c
+--- rp-pppoe-3.5-orig/src/pppoe-sniff.c	2002-07-08 09:38:24.000000000 -0500
++++ rp-pppoe-3.5/src/pppoe-sniff.c	2004-08-30 21:54:47.247626536 -0500
+@@ -194,7 +194,7 @@
+ 
+ #endif
+ 
+-    /* We assume interface is in promiscuous mode -- use ifconfig to
++    /* We assume interface is in promiscuous mode -- use 'ip link show' to
+        ensure this */
+     fprintf(stderr, "Sniffing for PADR.  Start your connection on another machine...\n");
+     while (!SeenPADR) {




More information about the blfs-book mailing list