Changeset 1744

Show
Ignore:
Timestamp:
10/27/06 09:29:36 (2 years ago)
Author:
alexander
Message:

Made the existing pppoe setup use the standard BLFS network service framework.
The setup is still based on http://wiki.linuxfromscratch.org/blfs/wiki/PPP

Location:
branches/6.2
Files:
1 added
3 modified

Legend:

Unmodified
Added
Removed

  • branches/6.2/etc/ppp/peers/pppoe

    r887 r1744  
    11plugin rp-pppoe.so 
    2 eth0 
    3 user "jdoe" 
    42noauth 
    53hide-password  

  • branches/6.2/packages/blfs-bootscripts/Makefile

    r1741 r1744  
    1010 
    1111PATCH1=$(NM)-add-autosshd-1.patch 
     12PATCH2=$(NM)-newpppoe-1.patch 
    1213 
    1314# Targets 
    … …  
    2425compile-stage2: 
    2526        patch -Np1 -i ../$(PATCH1) 
     27        patch -Np1 -i ../$(PATCH2) 
    2628        make install-service-dhcpcd 
    2729        make install-service-pppoe 

  • branches/6.2/scripts/net-setup

    r1734 r1744  
    236236        setup_papsecrets; 
    237237 
    238         # Make a backup and restore before changes, so the sed's work correctly. 
    239         [ -f /etc/ppp/peers/pppoe.orig ] || cp /etc/ppp/peers/pppoe{,.orig} 
    240         cp /etc/ppp/peers/pppoe{.orig,} 
    241  
    242         # Alter /etc/ppp/peers/pppoe file. 
    243         sed -i -e "s@eth0@$DEV@g" -e "s@jdoe@$F_USERNAME@g" /etc/ppp/peers/pppoe 
     238        # '# MC is stupid 
     239         
     240        echo "SERVICE=pppoe" >$ETHXCFG 
     241        echo "PPP_OPTS=\"user $F_USERNAME\"" >>$ETHXCFG 
    244242 
    245243        unset F_USERNAME F_PASSWORD DLG_COMMAND SELECTION 
    … …  
    296294                pppoe) 
    297295                        set_pppoe_cfg; 
    298                         modprobe ppp_generic ; modprobe pppoe ; sleep 1 
    299                         ip link set $DEV up 
    300                         pppd call pppoe updetach 
     296                        $IFUP $DEV 
    301297                        ;; 
    302298                *)