Ticket #58: Temp.diff

File Temp.diff, 14.0 KB (added by DJ Lucas, 21 years ago)

Final patch for this bug.

  • CVS/Entries

    diff -Naur BOOK-ORIG/CVS/Entries BOOK/CVS/Entries
    old new  
    11/INSTALL/1.1.1.1/Sun Jul  7 20:28:43 2002//
    22/README/1.1.1.1/Sun Jul  7 20:28:43 2002//
    33/blfs.dsl/1.1.1.1/Sun Jul  7 20:28:43 2002//
    4 /index.xml/1.254/Tue Aug 26 00:05:42 2003//
     4/index.xml/1.252/Sat Aug 23 03:18:02 2003//
    55D
  • appendices/symlinks/rc0.xml

    diff -Naur BOOK-ORIG/appendices/symlinks/rc0.xml BOOK/appendices/symlinks/rc0.xml
    old new  
    111111<entry>Stop network file system: <xref linkend="samba"/></entry>
    112112</row>
    113113
    114 
    115 
    116114<row>
    117115<entry>K48</entry>
    118116<entry>NFS</entry>
     
    122120
    123121<row>
    124122<entry>K49</entry>
     123<entry>adsl</entry>
     124<entry><filename>../init.d/adsl</filename></entry>
     125<entry>Stops the ADSL client: <xref linkend="pppoe"/></entry>
     126</row>
     127
     128<row>
     129<entry>K49</entry>
    125130<entry>portmap</entry>
    126131<entry><filename>../init.d/portmap</filename></entry>
    127132<entry>Stop Forwarding RPC requests: <xref linkend="portmap"/></entry>
  • appendices/symlinks/rc1.xml

    diff -Naur BOOK-ORIG/appendices/symlinks/rc1.xml BOOK/appendices/symlinks/rc1.xml
    old new  
    9292
    9393<row>
    9494<entry>K49</entry>
     95<entry>adsl</entry>
     96<entry><filename>../init.d/adsl</filename></entry>
     97<entry>Stops the ADSL client: <xref linkend="pppoe"/></entry>
     98</row>
     99
     100<row>
     101<entry>K49</entry>
    95102<entry>portmap</entry>
    96103<entry><filename>../init.d/portmap</filename></entry>
    97104<entry>Stop Forwarding RPC requests: <xref linkend="portmap"/></entry>
  • appendices/symlinks/rc2.xml

    diff -Naur BOOK-ORIG/appendices/symlinks/rc2.xml BOOK/appendices/symlinks/rc2.xml
    old new  
    7878
    7979<row>
    8080<entry>K49</entry>
     81<entry>adsl</entry>
     82<entry><filename>../init.d/adsl</filename></entry>
     83<entry>Stops the ADSL client: <xref linkend="pppoe"/></entry>
     84</row>
     85
     86<row>
     87<entry>K49</entry>
    8188<entry>portmap</entry>
    8289<entry><filename>../init.d/portmap</filename></entry>
    8390<entry>Stop Forwarding RPC requests: <xref linkend="portmap"/></entry>
  • appendices/symlinks/rc3.xml

    diff -Naur BOOK-ORIG/appendices/symlinks/rc3.xml BOOK/appendices/symlinks/rc3.xml
    old new  
    7171
    7272<row>
    7373<entry>S24</entry>
     74<entry>adsl</entry>
     75<entry><filename>../init.d/adsl</filename></entry>
     76<entry>Starts the ADSL client: <xref linkend="pppoe"/></entry>
     77</row>
     78
     79<row>
     80<entry>S24</entry>
    7481<entry>NFS</entry>
    7582<entry><filename>../init.d/nfs</filename></entry>
    7683<entry>Start network file system: </entry>
  • appendices/symlinks/rc4.xml

    diff -Naur BOOK-ORIG/appendices/symlinks/rc4.xml BOOK/appendices/symlinks/rc4.xml
    old new  
    7171
    7272<row>
    7373<entry>S24</entry>
     74<entry>adsl</entry>
     75<entry><filename>../init.d/adsl</filename></entry>
     76<entry>Starts the ADSL client: <xref linkend="pppoe"/></entry>
     77</row>
     78
     79<row>
     80<entry>S24</entry>
    7481<entry>NFS</entry>
    7582<entry><filename>../init.d/nfs</filename></entry>
    7683<entry>Start network file system: </entry>
  • appendices/symlinks/rc5.xml

    diff -Naur BOOK-ORIG/appendices/symlinks/rc5.xml BOOK/appendices/symlinks/rc5.xml
    old new  
    6464
    6565<row>
    6666<entry>S24</entry>
     67<entry>adsl</entry>
     68<entry><filename>../init.d/adsl</filename></entry>
     69<entry>Starts the ADSL client: <xref linkend="pppoe"/></entry>
     70</row>
     71
     72<row>
     73<entry>S24</entry>
    6774<entry>NFS</entry>
    6875<entry><filename>../init.d/nfs</filename></entry>
    6976<entry>Start network file system: </entry>
  • appendices/symlinks/rc6.xml

    diff -Naur BOOK-ORIG/appendices/symlinks/rc6.xml BOOK/appendices/symlinks/rc6.xml
    old new  
    113113
    114114<row>
    115115<entry>K49</entry>
     116<entry>adsl</entry>
     117<entry><filename>../init.d/adsl</filename></entry>
     118<entry>Stops the ADSL client: <xref linkend="pppoe"/></entry>
     119</row>
     120
     121<row>
     122<entry>K49</entry>
    116123<entry>portmap</entry>
    117124<entry><filename>../init.d/portmap</filename></entry>
    118125<entry>Stop Forwarding RPC requests: <xref linkend="portmap"/></entry>
  • connect/other/other.xml

    diff -Naur BOOK-ORIG/connect/other/other.xml BOOK/connect/other/other.xml
    old new  
    11<chapter id="connect-other">
    22<?dbhtml filename="other.html" dir="connect"?>
    3 <title>Other connection methods index</title>
     3<title>Other Connections</title>
    44
    55<para>Other methods to connect to large networks are through ISDN and
    6 PPPoE interfaces. Pages written for these interfaces are always welcome
    7 and will be included in future books, if available.</para>
     6PPPoE interfaces, among others.  PPPoE is discussed here.  Pages written
     7for ISDN (or others as the need arises) are always welcome and will be
     8included in future books, if available.</para>
    89
    910&connect-other-isdn;
    1011&pppoe;
  • connect/other/pppoe/pppoe-config.xml

    diff -Naur BOOK-ORIG/connect/other/pppoe/pppoe-config.xml BOOK/connect/other/pppoe/pppoe-config.xml
    old new  
    22<title>Configuring RP-PPPoE</title>
    33
    44<sect3><title>Config files</title>
    5 <para><filename>files to be determined</filename></para></sect3>
     5<para><filename>/etc/ppp/pppoe.conf,
     6/etc/ppp/firewall-standalone,
     7/etc/ppp/firewall-masq,
     8/etc/ppp/pppoe-server-options,
     9/etc/resolv.conf,
     10/etc/ppp/pap-seecrets,
     11/etc/ppp/chap-secrets</filename></para></sect3>
    612
    713<sect3><title>Configuration Information</title>
    814
    9 <para>To re-configure RP-PPPoE after installation, you should run the
    10 <filename>adsl-config</filename> script.</para>
     15<para>To configure RP-PPPoE after installation, you should run the
     16<filename>adsl-setup</filename> script.</para>
     17
     18<para>When configuring your connection, you will need to have your
     19ISPs nameserver information availible , as well as your username and
     20password.  You will also be asked wether you want to configure a
     21dial-on-demand or a constant connection.  If your service provider does
     22not charge by the minute, it is usually good to have a bootscript handle
     23the connection for you.  You can, of course, choose not to install the
     24following script, and start your connection manually with the
     25<filename>adsl-start</filename> script.</para>
     26
     27<para>Use the following commands to create the
     28<emphasis>optional</emphasis> <filename>adsl</filename> bootscript:</para>
     29
     30<para><screen><userinput>cat &gt; /etc/rc.d/init.d/adsl &lt;&lt; "EOF"
     31#!/bin/bash
     32# Begin $rc_base/init.d/adsl
     33
     34# Based on sysklogd script from LFS-3.1 and earlier.
     35# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
     36# adsl script written by DJ Lucas  - dj@lucasit.com
     37
     38source /etc/sysconfig/rc
     39source $rc_functions
     40
     41case "$1" in
     42        start)
     43                echo "Bringing up the ADSL interface..."
     44                /usr/sbin/adsl-start
     45                evaluate_retval
     46                ;;
     47
     48        stop)
     49                echo "Bringing down the ADSL interface..."
     50                /usr/sbin/adsl-stop
     51                evaluate_retval
     52                ;;
     53
     54        restart)
     55                $0 stop
     56                sleep 1
     57                $0 start
     58                ;;
     59
     60        status)
     61                /usr/sbin/adsl-status
     62                ;;
     63
     64        *)
     65                echo "Usage: $0 {start|stop|restart|status}"
     66                exit 1
     67                ;;
     68esac
     69
     70# End $rc_base/init.d/adsl
     71EOF
     72chmod 755 /etc/rc.d/init.d/adsl</userinput></screen></para>
     73
     74<para>Now create the necessary symlinks:</para>
     75
     76<para><screen><userinput>ln -sf ../init.d/adsl /etc/rc.d/rc0.d/K49adsl &amp;&amp;
     77ln -sf ../init.d/adsl /etc/rc.d/rc1.d/K49adsl &amp;&amp;
     78ln -sf ../init.d/adsl /etc/rc.d/rc2.d/K49adsl &amp;&amp;
     79ln -sf ../init.d/adsl /etc/rc.d/rc3.d/S24adsl &amp;&amp;
     80ln -sf ../init.d/adsl /etc/rc.d/rc4.d/S24adsl &amp;&amp;
     81ln -sf ../init.d/adsl /etc/rc.d/rc5.d/S24adsl &amp;&amp;
     82ln -sf ../init.d/adsl /etc/rc.d/rc6.d/K49adsl</userinput></screen></para>
    1183
    1284</sect3>
    1385
  • connect/other/pppoe/pppoe-desc.xml

    diff -Naur BOOK-ORIG/connect/other/pppoe/pppoe-desc.xml BOOK/connect/other/pppoe/pppoe-desc.xml
    old new  
    22<title>Contents</title>
    33
    44<para>The RP-PPPoE package contains <userinput>adsl-setup, adsl-start,
    5 and adsl-stop</userinput>.</para>
     5adls-status, adsl-stop, pppoe, pppoe-relay, pppoe-server, and
     6pppoe-sniff</userinput>.</para>
    67
    78</sect2>
    89
    910<sect2><title>Description</title>
    1011
    1112<sect3><title>adsl-setup</title>
    12 <para>a script for configuring the client.</para></sect3>
     13<para>A script for configuring the client.  Configuration is then stored
     14in <filename>/etc/ppp/pppoe.conf</filename>.</para></sect3>
    1315
    14 <sect3><title>adsl-start</title>
    15 <para>starts the client using the options specified when you
    16 ran <userinput>adsl-config</userinput>.</para></sect3>
     16<sect3><title>adsl-start</title><para>Starts the client using the options
     17specified in <filename>/etc/ppp/pppoe.conf</filename>.</para></sect3>
    1718
    18 <sect3><title>adsl-stop</title>
    19 <para>stops the client.</para></sect3>
     19<sect3><title>adsl-status</title><para>Displays the status of the adsl
     20connection</para></sect3>
     21
     22<sect3><title>adsl-stop</title><para>Stops the client.</para></sect3>
     23
     24<sect3><title>pppoe</title><para>This is the actual client itself.
     25Generally it should not be started on it's own</para></sect3>
     26
     27<sect3><title>pppoe-relay</title><para>Starts the server relay
     28agent.</para></sect3>
     29
     30<sect3><title>pppoe-server</title><para>Starts the server
     31componenet.</para></sect3>
     32
     33<sect3><title>pppoe-sniff</title><para>A small network sniffer designed
     34to assist in setting PPPOE_EXTRA setttings.</para></sect3>
    2035
    2136</sect2>
    2237
  • connect/other/pppoe/pppoe-exp.xml

    diff -Naur BOOK-ORIG/connect/other/pppoe/pppoe-exp.xml BOOK/connect/other/pppoe/pppoe-exp.xml
    old new  
    11<sect2>
    22<title>Command explanations</title>
    33
    4 <para>The 'go' script will run configure, make, and make install for
    5 you, with the most common options.  It will also run the adsl-setup
    6 script for configuring your connection.  Of course, you are free
    7 to run the commands individually to fine tune the installation.</para>
     4<para>These are the standard instalation commands that will install into
     5the <userinput>/usr</userinput> prefix.  You can optionally use the
     6<userinput>'go'</userinput> script in the root of the source tree, to
     7run the exact same commands, which are then, imediately followed by the
     8<userinput>adsl-setup</userinput> script.</para>
    89
    910</sect2>
    1011
  • connect/other/pppoe/pppoe-inst.xml

    diff -Naur BOOK-ORIG/connect/other/pppoe/pppoe-inst.xml BOOK/connect/other/pppoe/pppoe-inst.xml
    old new  
    11<sect2>
    22<title>Installation of RP-PPPoE</title>
    33
    4 <para>Install RP-PPPoE by running the following command:</para>
     4<para>Install RP-PPPoE by running the following commands:</para>
    55
    6 <para><screen><userinput>
    7 ./go</userinput></screen></para>
     6<para><screen><userinput>cd src &amp;&amp;
     7./configure &amp;&amp;
     8make &amp;&amp;
     9make install &amp;&amp;</userinput></screen></para>
    810
    911</sect2>
    1012
  • connect/other/pppoe/pppoe-intro.xml

    diff -Naur BOOK-ORIG/connect/other/pppoe/pppoe-intro.xml BOOK/connect/other/pppoe/pppoe-intro.xml
    old new  
    11<sect2>
    2 <title>Introduction to RP-PPPOE</title>
     2<title>Introduction to RP-PPPoE</title>
    33
    44<screen>Download location (HTTP):       <ulink url="&pppoe-download-http;"/>
    55Download location (FTP):        <ulink url="&pppoe-download-ftp;"/>
     
    77Package size:                   &pppoe-size;
    88Estimated Disk space required:  &pppoe-buildsize;</screen>
    99
    10 <para>The Roaring Penguin PPPoE client allows you to connect to
    11 large networks, most commonly DSL service providers, that use the PPPoE
    12 protocol.</para>
     10<para>The Roaring Penguin PPPoE package contains both a client, and a
     11userspace server componenet that runs works with the client. The
     12client allows you to connect to large networks that use the PPPoE protocol,
     13common among ADSL providers.  The server component runs along side the
     14client, allowing you configure other clients that send out a configuration
     15request.</para>
     16
     17<screen>RP-PPPoE depends on:
     18<xref linkend="ppp"/></screen>
     19
     20<para>In addition, if you plan to use demand dialing, or kernel mode
     21PPPoE, you need to patch ppp-2.4.1 and re-install.</para>
     22<para>The patch can be downloaded from here:
     23<ulink url="&hfile-root;/ppp-2.4.1-pppoe-4.patch"/></para>
    1324
    1425</sect2>
  • connect/other/pppoe/pppoe.ent

    diff -Naur BOOK-ORIG/connect/other/pppoe/pppoe.ent BOOK/connect/other/pppoe/pppoe.ent
    old new  
    44<!ENTITY pppoe-exp SYSTEM "pppoe-exp.xml">
    55<!ENTITY pppoe-desc SYSTEM "pppoe-desc.xml">
    66<!ENTITY pppoe-config SYSTEM "pppoe-config.xml">
    7 <!ENTITY pppoe-buildsize "TBD">
     7<!ENTITY pppoe-buildsize "2.5 MB">
    88<!ENTITY pppoe-version "3.5">
    99<!ENTITY pppoe-download-http "http://www.roaringpenguin.com/pppoe/rp-pppoe-3.5.tar.gz">
    1010<!ENTITY pppoe-download-ftp "ftp://ftp.rutgers.edu/pub/slackware/slackware_source/n/rp-pppoe/rp-pppoe-3.5.tar.gz">