source: freewrt/package/rp-pppoe/patches/rp-pppoe-3.5-scripts-fixes.patch

scripts/adsl-connect.in

@@ -18 +18 @@
 # Usage: adsl-connect [config_file]
 #        adsl-connect interface user [config_file]
 # Second form overrides USER and ETH from config file.
-# If config_file is omitted, defaults to /etc//ppp/pppoe.conf
+# If config_file is omitted, defaults to /etc/pppoe.conf
 #
 #***********************************************************************
 
@@ -30 +30 @@
 # Paths to programs
 IFCONFIG=/sbin/ifconfig
 PPPD=@PPPD@
-SETSID=@SETSID@
+SETSID=
 PPPOE=@sbindir@/pppoe
 LOGGER="/usr/bin/logger -t `basename $0`"
 
+#MODPROBE=modprobe
+MODPROBE=insmod
+
 # Set to "C" locale so we can parse messages from commands
 LANG=C
 export LANG
 
-# Must be root
-if test "`@ID@ -u`" != 0 ; then
-    echo "$0: You must be root to run this script" >& 2
-    exit 1
-fi
-
 if test "$SETSID" != "" -a ! -x "$SETSID"; then
     SETSID=""
 fi
 
-CONFIG=/etc//ppp/pppoe.conf
+CONFIG=/etc/pppoe.conf
 USER=""
 ETH=""
 
@@ -117 +114 @@
 if test `uname -s` = Linux ; then
     $IFCONFIG $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
-    modprobe ppp_synctty > /dev/null 2>&1
+    $MODPROBE ppp_generic > /dev/null 2>&1
+    $MODPROBE ppp_async > /dev/null 2>&1
+    $MODPROBE ppp_synctty > /dev/null 2>&1
     if test -n "$LINUX_PLUGIN" ; then
-        modprobe pppox > /dev/null 2>&1
-        modprobe pppoe > /dev/null 2>&1
+        $MODPROBE pppox > /dev/null 2>&1
+        $MODPROBE pppoe > /dev/null 2>&1
     fi
 fi
 
@@ -131 +128 @@
     PPPD_SYNC=sync
         # Increase the chances of it working on Linux...
     if test `uname -s` = Linux ; then
-        modprobe n_hdlc > /dev/null 2>&1
+        $MODPROBE n_hdlc > /dev/null 2>&1
     fi
 else
     PPPOE_SYNC=""
@@ -204 +201 @@
 
     # Interface name MUST BE LAST!!
     PLUGIN_OPTS="$PLUGIN_OPTS $ETH"
-    modprobe pppoe > /dev/null 2>&1
+    $MODPROBE pppoe > /dev/null 2>&1
 fi
 
 if test "$DEFAULTROUTE" != "no" ; then

scripts/adsl-setup.in

@@ -27 +27 @@
 LANG=C
 export LANG
 
-CONFIG=/etc/ppp/pppoe.conf
+CONFIG=/etc/pppoe.conf
 
 # Protect created files
 umask 077
@@ -46 +46 @@
 $ECHO "properly..."
 $ECHO ""
 
-# Must be root
-if [ "`@ID@ -u`" != 0 ] ; then
-    $ECHO "$0: Sorry, you must be root to run this script"
-    exit 1
-fi
-
 # Prototype config file must exist
 if [ ! -r "$CONFIG" ] ; then
     $ECHO "Oh, dear, I don't see the file '$CONFIG' anywhere.  Please"
@@ -280 +274 @@
     fi
 fi
 
-# Where is pppd likely to put its pid?
-if [ -d /var/run ] ; then
-    VARRUN=/var/run
-else
-    VARRUN=/etc/ppp
-fi
+VARRUN=/var/run
 
 # Some #$(*& ISP's use a slash in the user name...
 sed -e "s&^USER=.*&USER='$U'&" \

scripts/adsl-start.in

@@ -18 +18 @@
 # Usage: adsl-start [config_file]
 #        adsl-start interface user [config_file]
 # Second form overrides USER and ETH from config file.
-# If config_file is omitted, defaults to /etc/ppp/pppoe.conf
+# If config_file is omitted, defaults to /etc/pppoe.conf
 #
 #***********************************************************************
 
@@ -36 +36 @@
 export LANG
 
 # Defaults
-CONFIG=/etc/ppp/pppoe.conf
+CONFIG=/etc/pppoe.conf
 USER=""
 ETH=""
 ME=`basename $0`
-# Must be root
-if [ "`@ID@ -u`" != 0 ] ; then
-    $ECHO "$ME: You must be root to run this script" >& 2
-    exit 1
-fi
+
+#TTY_S="tty -s"
+TTY_S=/bin/true
 
 # Debugging
 if [ "$DEBUG" = "1" ] ; then
@@ -139 +137 @@
     fi
     # Delete bogus PIDFILE
     rm -f "$PIDFILE" "$PIDFILE.pppd" "$PIDFILE.pppoe" "$PIDFILE.start"
+else
+  mkdir -p /var/run
 fi
 
 echo $$ > $PIDFILE.start
@@ -169 +169 @@
     # Looks like the interface came up
     if [ $? = 0 ] ; then
         # Print newline if standard input is a TTY
-        tty -s && $ECHO " Connected!"
+        $TTY_S && $ECHO " Connected!"
         exit 0
     fi
 
     if test -n "$FORCEPING" ; then
         $ECHO -n "$FORCEPING"
     else
-        tty -s && $ECHO -n "$PING"
+        $TTY_S && $ECHO -n "$PING"
     fi
     sleep $CONNECT_POLL
     TIME=`expr $TIME + $CONNECT_POLL`

scripts/adsl-status

@@ -15 +15 @@
 # LIC: GPL
 #
 # Usage: adsl-status [config_file]
-# If config_file is omitted, defaults to /etc/ppp/pppoe.conf
+# If config_file is omitted, defaults to /etc/pppoe.conf
 #
 #***********************************************************************
 
 # Defaults
-CONFIG=/etc/ppp/pppoe.conf
+CONFIG=/etc/pppoe.conf
 
 case "$#" in
     1)
@@ -58 +58 @@
 
 PPPD_PID=`cat "$PPPD_PIDFILE"`
 
-# Sigh.  Some versions of pppd put PID files in /var/run; others put them
-# in /etc/ppp.  Since it's too messy to figure out what pppd does, we
-# try both locations.
-for i in /etc/ppp/ppp*.pid /var/run/ppp*.pid ; do
+for i in /var/run/ppp*.pid ; do
     if [ -r $i ] ; then
         PID=`cat $i`
         if [ "$PID" = "$PPPD_PID" ] ; then

scripts/adsl-stop.in

@@ -16 +16 @@
 # LIC: GPL
 #
 # Usage: adsl-stop [config_file]
-# If config_file is omitted, defaults to /etc/ppp/pppoe.conf
+# If config_file is omitted, defaults to /etc/pppoe.conf
 #
 #***********************************************************************
 
@@ -28 +28 @@
 LOGGER="/usr/bin/logger -t $ME"
 CONFIG="$1"
 if [ "$CONFIG" = "" ] ; then
-    CONFIG=/etc/ppp/pppoe.conf
+    CONFIG=/etc/pppoe.conf
 fi
 
 if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then