[Devil-linux-commit] build/scripts rp-pppoe,1.14,1.14.2.1

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13831/scripts

Modified Files:
      Tag: rel-1-2-patches
	rp-pppoe 
Log Message:
adsl init script now supports multiple dsl configs


Index: rp-pppoe
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/rp-pppoe,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- rp-pppoe	4 Mar 2004 01:11:53 -0000	1.14
+++ rp-pppoe	29 Jan 2005 21:16:15 -0000	1.14.2.1
@@ -44,19 +44,21 @@
 
     install )
 	if [ "$CONFIG_RPPPPOE" = "y" ] && [ "$CONFIG_PPP" = "y" ]; then
-            rm -rf $WORKDIR/tmp || exit 1
-    	    mkdir -p $WORKDIR/tmp || exit 1
+            rm -rf $TMPDIR || exit 1
+    	    mkdir -p $TMPDIR || exit 1
 	    cd src
-	    make install RPM_INSTALL_ROOT=$WORKDIR/tmp || exit 1
-            copy_docs $WORKDIR/tmp
-            copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
-	    rm -f $WORKDIR/tmp/etc/ppp/firewall*
-            copy_files $WORKDIR/tmp/etc $ETCDIR/ || exit 1
-            rm -rf $WORKDIR/tmp || exit 1
+	    make install RPM_INSTALL_ROOT=$TMPDIR || exit 1
+            copy_docs $TMPDIR
+            copy_files $TMPDIR/usr $CDDIR/ || exit 1
+	    rm -f $TMPDIR/etc/ppp/firewall*
+            copy_files $TMPDIR/etc $ETCDIR/ || exit 1
+            rm -rf $TMPDIR || exit 1
 		cp $MYDIR/scripts/adsl $ETCDIR/etc/init.d || exit 1
 		echo "# Start ADSL connection?" >> $CONFIGFILE
 		echo "# of course you have to configure it first" >> $CONFIGFILE
 		echo "START_ADSL=no" >> $CONFIGFILE
+		echo "#uncomment the next line if you have more then one DSL connection" >> $CONFIGFILE
+		echo "#ADSL_CONFIGS="/etc/ppp/pppoe0.conf /etc/ppp/pppoe1.conf"" >> $CONFIGFILE
 		echo >> $CONFIGFILE
 		echo "HELP_ADSL=\"This starts a pre-configured ADSL connection\"" >> $SOFTWAREHELP
 	fi