projects / packages / rp-pppoe.git / blame
| Commit | Line | Data |
|---|---|---|
| 595e5f81 | 1 | diff -urN rp-pppoe-3.7.orig/scripts/pppoe-setup.in rp-pppoe-3.7/scripts/pppoe-setup.in |
| 2 | --- rp-pppoe-3.7.orig/scripts/pppoe-setup.in 2005-11-17 03:14:32.000000000 +0100 | |
| 3 | +++ rp-pppoe-3.7/scripts/pppoe-setup.in 2005-12-21 17:29:08.000000000 +0100 | |
| 09f22154 AM |
4 | @@ -20,7 +20,6 @@ |
| 5 | IFCONFIG=/sbin/ifconfig | |
| 6 | PPPD=@PPPD@ | |
| 7 | PPPOE=@sbindir@/pppoe | |
| 8 | -ECHO=@ECHO@ | |
| 9 | LOGGER="/usr/bin/logger -t `basename $0`" | |
| 10 | ||
| 11 | # Set to "C" locale so we can parse messages from commands | |
| 12 | @@ -35,34 +34,34 @@ | |
| 13 | copy() { | |
| 14 | cp $1 $2 | |
| 15 | if [ "$?" != 0 ] ; then | |
| 16 | - $ECHO "*** Error copying $1 to $2" | |
| 17 | - $ECHO "*** Quitting." | |
| 18 | + echo "*** Error copying $1 to $2" | |
| 19 | + echo "*** Quitting." | |
| 20 | exit 1 | |
| 21 | fi | |
| 22 | } | |
| 23 | ||
| 595e5f81 | 24 | -$ECHO "Welcome to the Roaring Penguin PPPoE client setup. First, I will run" |
| 09f22154 AM |
25 | -$ECHO "some checks on your system to make sure the PPPoE client is installed" |
| 26 | -$ECHO "properly..." | |
| 27 | -$ECHO "" | |
| 595e5f81 | 28 | +echo "Welcome to the Roaring Penguin PPPoE client setup. First, I will run" |
| 09f22154 AM |
29 | +echo "some checks on your system to make sure the PPPoE client is installed" |
| 30 | +echo "properly..." | |
| 31 | +echo "" | |
| 32 | ||
| 33 | # Must be root | |
| 34 | if [ "`@ID@ -u`" != 0 ] ; then | |
| 35 | - $ECHO "$0: Sorry, you must be root to run this script" | |
| 36 | + echo "$0: Sorry, you must be root to run this script" | |
| 37 | exit 1 | |
| 38 | fi | |
| 39 | ||
| 40 | # Prototype config file must exist | |
| 41 | if [ ! -r "$CONFIG" ] ; then | |
| 42 | - $ECHO "Oh, dear, I don't see the file '$CONFIG' anywhere. Please" | |
| 43 | - $ECHO "re-install the PPPoE client." | |
| 44 | + echo "Oh, dear, I don't see the file '$CONFIG' anywhere. Please" | |
| 45 | + echo "re-install the PPPoE client." | |
| 46 | exit 1 | |
| 47 | fi | |
| 48 | ||
| 49 | # Must have pppd | |
| 50 | if [ ! -x $PPPD ] ; then | |
| 51 | - $ECHO "Oops, I can't execute the program '$PPPD'. You" | |
| 52 | - $ECHO "must install the PPP software suite, version 2.3.10 or later." | |
| 53 | + echo "Oops, I can't execute the program '$PPPD'. You" | |
| 54 | + echo "must install the PPP software suite, version 2.3.10 or later." | |
| 55 | exit 1 | |
| 56 | fi | |
| 595e5f81 | 57 | export CONFIG |
| 58 | @@ -74,17 +73,17 @@ | |
| 09f22154 AM |
59 | |
| 60 | # pppoe must exist | |
| 61 | if [ ! -x "$PPPOE" ] ; then | |
| 62 | - $ECHO "Oh, dear, I can't execute the program '$PPPOE'. Please" | |
| 63 | - $ECHO "re-install the rp-pppoe client." | |
| 64 | + echo "Oh, dear, I can't execute the program '$PPPOE'. Please" | |
| 65 | + echo "re-install the rp-pppoe client." | |
| 66 | exit 1 | |
| 67 | fi | |
| 68 | ||
| 69 | -$ECHO "Looks good! Now, please enter some information:" | |
| 70 | +echo "Looks good! Now, please enter some information:" | |
| 71 | ||
| 72 | while [ true ] ; do | |
| 73 | - $ECHO "" | |
| 74 | - $ECHO "USER NAME" | |
| 75 | - $ECHO "" | |
| 09f22154 AM |
76 | + echo "" |
| 77 | + echo "USER NAME" | |
| 78 | + echo "" | |
| 595e5f81 | 79 | printf "%s" ">>> Enter your PPPoE user name (default $USER): " |
| 09f22154 AM |
80 | read U |
| 81 | ||
| 595e5f81 | 82 | @@ -96,12 +95,12 @@ |
| 09f22154 AM |
83 | if test `uname -s` = "Linux" ; then |
| 84 | $IFCONFIG $ETH > /dev/null 2>&1 || ETH=eth0 | |
| 85 | fi | |
| 86 | - $ECHO "" | |
| 87 | - $ECHO "INTERFACE" | |
| 88 | - $ECHO "" | |
| 595e5f81 | 89 | - $ECHO ">>> Enter the Ethernet interface connected to the DSL modem" |
| 09f22154 AM |
90 | - $ECHO "For Solaris, this is likely to be something like /dev/hme0." |
| 91 | - $ECHO "For Linux, it will be ethn, where 'n' is a number." | |
| 09f22154 AM |
92 | + echo "" |
| 93 | + echo "INTERFACE" | |
| 94 | + echo "" | |
| 595e5f81 | 95 | + echo ">>> Enter the Ethernet interface connected to the DSL modem" |
| 09f22154 AM |
96 | + echo "For Solaris, this is likely to be something like /dev/hme0." |
| 97 | + echo "For Linux, it will be ethn, where 'n' is a number." | |
| 595e5f81 | 98 | printf "%s" "(default $ETH): " |
| 09f22154 AM |
99 | read E |
| 100 | ||
| 595e5f81 | 101 | @@ -109,27 +108,27 @@ |
| 09f22154 AM |
102 | E="$ETH" |
| 103 | fi | |
| 104 | ||
| 105 | - $ECHO "" | |
| 106 | - $ECHO "Do you want the link to come up on demand, or stay up continuously?" | |
| 107 | - $ECHO "If you want it to come up on demand, enter the idle time in seconds" | |
| 108 | - $ECHO "after which the link should be dropped. If you want the link to" | |
| 109 | - $ECHO "stay up permanently, enter 'no' (two letters, lower-case.)" | |
| 110 | - $ECHO "NOTE: Demand-activated links do not interact well with dynamic IP" | |
| 111 | - $ECHO "addresses. You may have some problems with demand-activated links." | |
| 09f22154 AM |
112 | + echo "" |
| 113 | + echo "Do you want the link to come up on demand, or stay up continuously?" | |
| 114 | + echo "If you want it to come up on demand, enter the idle time in seconds" | |
| 115 | + echo "after which the link should be dropped. If you want the link to" | |
| 116 | + echo "stay up permanently, enter 'no' (two letters, lower-case.)" | |
| 117 | + echo "NOTE: Demand-activated links do not interact well with dynamic IP" | |
| 118 | + echo "addresses. You may have some problems with demand-activated links." | |
| 595e5f81 | 119 | printf "%s" ">>> Enter the demand value (default $DEMAND): " |
| 09f22154 AM |
120 | read D |
| 121 | if [ "$D" = "" ] ; then | |
| 122 | D=$DEMAND | |
| 123 | fi | |
| 124 | ||
| 125 | - $ECHO "" | |
| 126 | - $ECHO "DNS" | |
| 127 | - $ECHO "" | |
| 128 | - $ECHO "Please enter the IP address of your ISP's primary DNS server." | |
| 129 | - $ECHO "If your ISP claims that 'the server will provide DNS addresses'," | |
| 130 | - $ECHO "enter 'server' (all lower-case) here." | |
| 131 | - $ECHO "If you just press enter, I will assume you know what you are" | |
| 132 | - $ECHO "doing and not modify your DNS setup." | |
| 09f22154 AM |
133 | + echo "" |
| 134 | + echo "DNS" | |
| 135 | + echo "" | |
| 136 | + echo "Please enter the IP address of your ISP's primary DNS server." | |
| 137 | + echo "If your ISP claims that 'the server will provide DNS addresses'," | |
| 138 | + echo "enter 'server' (all lower-case) here." | |
| 139 | + echo "If you just press enter, I will assume you know what you are" | |
| 140 | + echo "doing and not modify your DNS setup." | |
| 595e5f81 | 141 | printf "%s" ">>> Enter the DNS information here: " |
| 09f22154 AM |
142 | |
| 143 | read DNS1 | |
| 595e5f81 | 144 | @@ -137,24 +136,24 @@ |
| 09f22154 AM |
145 | |
| 146 | if [ "$DNS1" != "" ] ; then | |
| 147 | if [ "$DNS1" != "server" ] ; then | |
| 148 | - $ECHO "Please enter the IP address of your ISP's secondary DNS server." | |
| 149 | - $ECHO "If you just press enter, I will assume there is only one DNS server." | |
| 09f22154 AM |
150 | + echo "Please enter the IP address of your ISP's secondary DNS server." |
| 151 | + echo "If you just press enter, I will assume there is only one DNS server." | |
| 595e5f81 | 152 | printf "%s" ">>> Enter the secondary DNS server address here: " |
| 09f22154 AM |
153 | read DNS2 |
| 154 | fi | |
| 155 | fi | |
| 156 | ||
| 157 | while [ true ] ; do | |
| 158 | - $ECHO "" | |
| 159 | - $ECHO "PASSWORD" | |
| 160 | - $ECHO "" | |
| 161 | + echo "" | |
| 162 | + echo "PASSWORD" | |
| 163 | + echo "" | |
| 164 | stty -echo | |
| 595e5f81 | 165 | printf "%s" ">>> Please enter your PPPoE password: " |
| 09f22154 AM |
166 | read PWD1 |
| 167 | - $ECHO "" | |
| 09f22154 | 168 | + echo "" |
| 595e5f81 | 169 | printf "%s" ">>> Please re-enter your PPPoE password: " |
| 09f22154 AM |
170 | read PWD2 |
| 171 | - $ECHO "" | |
| 172 | + echo "" | |
| 173 | stty echo | |
| 174 | if [ "$PWD1" = "$PWD2" ] ; then | |
| 175 | break | |
| 595e5f81 | 176 | @@ -164,44 +163,44 @@ |
| 09f22154 AM |
177 | read ANS |
| 178 | case "$ANS" in | |
| 179 | N|No|NO|Non|n|no|non) | |
| 180 | - $ECHO "OK, quitting. Bye." | |
| 181 | + echo "OK, quitting. Bye." | |
| 182 | exit 1 | |
| 183 | esac | |
| 184 | done | |
| 185 | ||
| 186 | # Firewalling | |
| 187 | - $ECHO "" | |
| 188 | - $ECHO "FIREWALLING" | |
| 189 | - $ECHO "" | |
| 190 | + echo "" | |
| 191 | + echo "FIREWALLING" | |
| 192 | + echo "" | |
| 193 | if test `uname -s` != "Linux" ; then | |
| 194 | - $ECHO "Sorry, firewalling is only supported under Linux. Consult" | |
| 195 | - $ECHO "your operating system manuals for details on setting up" | |
| 196 | - $ECHO "packet filters for your system." | |
| 197 | + echo "Sorry, firewalling is only supported under Linux. Consult" | |
| 198 | + echo "your operating system manuals for details on setting up" | |
| 199 | + echo "packet filters for your system." | |
| 200 | FIREWALL=NONE | |
| 201 | else | |
| 202 | - $ECHO "Please choose the firewall rules to use. Note that these rules are" | |
| 203 | - $ECHO "very basic. You are strongly encouraged to use a more sophisticated" | |
| 204 | - $ECHO "firewall setup; however, these will provide basic security. If you" | |
| 205 | - $ECHO "are running any servers on your machine, you must choose 'NONE' and" | |
| 206 | - $ECHO "set up firewalling yourself. Otherwise, the firewall rules will deny" | |
| 207 | - $ECHO "access to all standard servers like Web, e-mail, ftp, etc. If you" | |
| 208 | - $ECHO "are using SSH, the rules will block outgoing SSH connections which" | |
| 209 | - $ECHO "allocate a privileged source port." | |
| 210 | - $ECHO "" | |
| 211 | + echo "Please choose the firewall rules to use. Note that these rules are" | |
| 212 | + echo "very basic. You are strongly encouraged to use a more sophisticated" | |
| 213 | + echo "firewall setup; however, these will provide basic security. If you" | |
| 214 | + echo "are running any servers on your machine, you must choose 'NONE' and" | |
| 215 | + echo "set up firewalling yourself. Otherwise, the firewall rules will deny" | |
| 216 | + echo "access to all standard servers like Web, e-mail, ftp, etc. If you" | |
| 217 | + echo "are using SSH, the rules will block outgoing SSH connections which" | |
| 218 | + echo "allocate a privileged source port." | |
| 219 | + echo "" | |
| 220 | while [ true ] ; do | |
| 221 | - $ECHO "The firewall choices are:" | |
| 222 | - $ECHO "0 - NONE: This script will not set any firewall rules. You are responsible" | |
| 223 | - $ECHO " for ensuring the security of your machine. You are STRONGLY" | |
| 224 | - $ECHO " recommended to use some kind of firewall rules." | |
| 225 | - $ECHO "1 - STANDALONE: Appropriate for a basic stand-alone web-surfing workstation" | |
| 226 | - $ECHO "2 - MASQUERADE: Appropriate for a machine acting as an Internet gateway" | |
| 227 | - $ECHO " for a LAN" | |
| 09f22154 AM |
228 | + echo "The firewall choices are:" |
| 229 | + echo "0 - NONE: This script will not set any firewall rules. You are responsible" | |
| 230 | + echo " for ensuring the security of your machine. You are STRONGLY" | |
| 231 | + echo " recommended to use some kind of firewall rules." | |
| 232 | + echo "1 - STANDALONE: Appropriate for a basic stand-alone web-surfing workstation" | |
| 233 | + echo "2 - MASQUERADE: Appropriate for a machine acting as an Internet gateway" | |
| 234 | + echo " for a LAN" | |
| 595e5f81 | 235 | printf "%s" ">>> Choose a type of firewall (0-2): " |
| 09f22154 AM |
236 | read a |
| 237 | if [ "$a" = 0 -o "$a" = 1 -o "$a" = 2 ] ; then | |
| 238 | break | |
| 239 | fi | |
| 240 | - $ECHO "Please enter a number from 0 to 2" | |
| 241 | + echo "Please enter a number from 0 to 2" | |
| 242 | done | |
| 243 | ||
| 244 | case "$a" in | |
| 595e5f81 | 245 | @@ -217,31 +216,31 @@ |
| 09f22154 AM |
246 | esac |
| 247 | fi | |
| 248 | ||
| 249 | - $ECHO "" | |
| 250 | - $ECHO "** Summary of what you entered **" | |
| 251 | - $ECHO "" | |
| 252 | - $ECHO "Ethernet Interface: $E" | |
| 253 | - $ECHO "User name: $U" | |
| 254 | + echo "" | |
| 255 | + echo "** Summary of what you entered **" | |
| 256 | + echo "" | |
| 257 | + echo "Ethernet Interface: $E" | |
| 258 | + echo "User name: $U" | |
| 259 | if [ "$D" = "no" ] ; then | |
| 260 | - $ECHO "Activate-on-demand: No" | |
| 261 | + echo "Activate-on-demand: No" | |
| 262 | else | |
| 263 | - $ECHO "Activate-on-demand: Yes; idle timeout = $D seconds" | |
| 264 | + echo "Activate-on-demand: Yes; idle timeout = $D seconds" | |
| 265 | fi | |
| 266 | ||
| 267 | if [ "$DNS1" != "" ] ; then | |
| 268 | if [ "$DNS1" = "server" ] ; then | |
| 269 | - $ECHO "DNS addresses: Supplied by ISP's server" | |
| 270 | + echo "DNS addresses: Supplied by ISP's server" | |
| 271 | else | |
| 272 | - $ECHO "Primary DNS: $DNS1" | |
| 273 | + echo "Primary DNS: $DNS1" | |
| 274 | if [ "$DNS2" != "" ] ; then | |
| 275 | - $ECHO "Secondary DNS: $DNS2" | |
| 276 | + echo "Secondary DNS: $DNS2" | |
| 277 | fi | |
| 278 | fi | |
| 279 | else | |
| 280 | - $ECHO "DNS: Do not adjust" | |
| 281 | + echo "DNS: Do not adjust" | |
| 282 | fi | |
| 283 | - $ECHO "Firewalling: $FIREWALL" | |
| 284 | - $ECHO "" | |
| 285 | + echo "Firewalling: $FIREWALL" | |
| 286 | + echo "" | |
| 287 | while [ true ] ; do | |
| 595e5f81 | 288 | printf "%s" '>>> Accept these settings and adjust configuration files (y/n)? ' |
| 09f22154 | 289 | read ANS |
| 09f22154 AM |
290 | @@ -264,7 +263,7 @@ |
| 291 | ||
| 292 | # Adjust configuration files. First to $CONFIG | |
| 293 | ||
| 294 | -$ECHO "Adjusting $CONFIG" | |
| 295 | +echo "Adjusting $CONFIG" | |
| 296 | ||
| 297 | copy $CONFIG $CONFIG-bak | |
| 298 | if [ "$DNS1" = "server" ] ; then | |
| 299 | @@ -300,53 +299,53 @@ | |
| 300 | < $CONFIG-bak > $CONFIG | |
| 301 | ||
| 302 | if [ $? != 0 ] ; then | |
| 303 | - $ECHO "** Error modifying $CONFIG" | |
| 304 | - $ECHO "** Quitting" | |
| 305 | + echo "** Error modifying $CONFIG" | |
| 306 | + echo "** Quitting" | |
| 307 | exit 1 | |
| 308 | fi | |
| 309 | ||
| 310 | if [ "$DNS1" != "" ] ; then | |
| 311 | if [ "$DNS1" != "server" ] ; then | |
| 312 | - $ECHO "Adjusting /etc/resolv.conf" | |
| 313 | + echo "Adjusting /etc/resolv.conf" | |
| 314 | if [ -r /etc/resolv.conf ] ; then | |
| 315 | grep -s "MADE-BY-RP-PPPOE" /etc/resolv.conf > /dev/null 2>&1 | |
| 316 | if [ "$?" != 0 ] ; then | |
| 317 | - $ECHO " (But first backing it up to /etc/resolv.conf-bak)" | |
| 318 | + echo " (But first backing it up to /etc/resolv.conf-bak)" | |
| 319 | copy /etc/resolv.conf /etc/resolv.conf-bak | |
| 320 | fi | |
| 321 | fi | |
| 322 | - $ECHO "# MADE-BY-RP-PPPOE" > /etc/resolv.conf | |
| 323 | - $ECHO "nameserver $DNS1" >> /etc/resolv.conf | |
| 324 | + echo "# MADE-BY-RP-PPPOE" > /etc/resolv.conf | |
| 325 | + echo "nameserver $DNS1" >> /etc/resolv.conf | |
| 326 | if [ "$DNS2" != "" ] ; then | |
| 327 | - $ECHO "nameserver $DNS2" >> /etc/resolv.conf | |
| 328 | + echo "nameserver $DNS2" >> /etc/resolv.conf | |
| 329 | fi | |
| 330 | fi | |
| 331 | fi | |
| 332 | ||
| 333 | -$ECHO "Adjusting /etc/ppp/pap-secrets and /etc/ppp/chap-secrets" | |
| 334 | +echo "Adjusting /etc/ppp/pap-secrets and /etc/ppp/chap-secrets" | |
| 335 | if [ -r /etc/ppp/pap-secrets ] ; then | |
| 336 | - $ECHO " (But first backing it up to /etc/ppp/pap-secrets-bak)" | |
| 337 | + echo " (But first backing it up to /etc/ppp/pap-secrets-bak)" | |
| 338 | copy /etc/ppp/pap-secrets /etc/ppp/pap-secrets-bak | |
| 339 | else | |
| 340 | cp /dev/null /etc/ppp/pap-secrets-bak | |
| 341 | fi | |
| 342 | if [ -r /etc/ppp/chap-secrets ] ; then | |
| 343 | - $ECHO " (But first backing it up to /etc/ppp/chap-secrets-bak)" | |
| 344 | + echo " (But first backing it up to /etc/ppp/chap-secrets-bak)" | |
| 345 | copy /etc/ppp/chap-secrets /etc/ppp/chap-secrets-bak | |
| 346 | else | |
| 347 | cp /dev/null /etc/ppp/chap-secrets-bak | |
| 348 | fi | |
| 349 | ||
| 350 | egrep -v "^$U|^\"$U\"" /etc/ppp/pap-secrets-bak > /etc/ppp/pap-secrets | |
| 351 | -$ECHO "\"$U\" * \"$PWD1\"" >> /etc/ppp/pap-secrets | |
| 352 | +echo "\"$U\" * \"$PWD1\"" >> /etc/ppp/pap-secrets | |
| 353 | egrep -v "^$U|^\"$U\"" /etc/ppp/chap-secrets-bak > /etc/ppp/chap-secrets | |
| 354 | -$ECHO "\"$U\" * \"$PWD1\"" >> /etc/ppp/chap-secrets | |
| 355 | +echo "\"$U\" * \"$PWD1\"" >> /etc/ppp/chap-secrets | |
| 356 | ||
| 357 | -$ECHO "" | |
| 358 | -$ECHO "" | |
| 359 | -$ECHO "" | |
| 360 | -$ECHO "Congratulations, it should be all set up!" | |
| 361 | -$ECHO "" | |
| 595e5f81 | 362 | -$ECHO "Type 'pppoe-start' to bring up your PPPoE link and 'pppoe-stop' to bring" |
| 363 | -$ECHO "it down. Type 'pppoe-status' to see the link status." | |
| 09f22154 AM |
364 | +echo "" |
| 365 | +echo "" | |
| 366 | +echo "" | |
| 367 | +echo "Congratulations, it should be all set up!" | |
| 368 | +echo "" | |
| 595e5f81 | 369 | +echo "Type 'pppoe-start' to bring up your PPPoE link and 'pppoe-stop' to bring" |
| 370 | +echo "it down. Type 'pppoe-status' to see the link status." | |
| 09f22154 | 371 | exit 0 |
| 595e5f81 | 372 | diff -urN rp-pppoe-3.7.orig/scripts/pppoe-start.in rp-pppoe-3.7/scripts/pppoe-start.in |
| 373 | --- rp-pppoe-3.7.orig/scripts/pppoe-start.in 2005-11-17 03:14:32.000000000 +0100 | |
| 374 | +++ rp-pppoe-3.7/scripts/pppoe-start.in 2005-12-21 17:29:28.000000000 +0100 | |
| 09f22154 AM |
375 | @@ -28,7 +28,6 @@ |
| 376 | ||
| 377 | # Paths to programs | |
| 595e5f81 | 378 | CONNECT=@sbindir@/pppoe-connect |
| 09f22154 AM |
379 | -ECHO=@ECHO@ |
| 380 | IFCONFIG=/sbin/ifconfig | |
| 381 | ||
| 382 | # Set to "C" locale so we can parse messages from commands | |
| 383 | @@ -42,63 +41,63 @@ | |
| 384 | ME=`basename $0` | |
| 385 | # Must be root | |
| 386 | if [ "`@ID@ -u`" != 0 ] ; then | |
| 387 | - $ECHO "$ME: You must be root to run this script" >& 2 | |
| 388 | + echo "$ME: You must be root to run this script" >& 2 | |
| 389 | exit 1 | |
| 390 | fi | |
| 391 | ||
| 392 | # Debugging | |
| 393 | if [ "$DEBUG" = "1" ] ; then | |
| 394 | - $ECHO "*** Running in debug mode... please be patient..." | |
| 395 | + echo "*** Running in debug mode... please be patient..." | |
| 396 | DEBUG=/tmp/pppoe-debug-$$ | |
| 397 | export DEBUG | |
| 398 | mkdir $DEBUG | |
| 399 | if [ "$?" != 0 ] ; then | |
| 400 | - $ECHO "Could not create directory $DEBUG... exiting" | |
| 401 | + echo "Could not create directory $DEBUG... exiting" | |
| 402 | exit 1 | |
| 403 | fi | |
| 404 | DEBUG=$DEBUG/pppoe-debug.txt | |
| 405 | ||
| 406 | # Initial debug output | |
| 407 | - $ECHO "---------------------------------------------" > $DEBUG | |
| 408 | - $ECHO "* The following section contains information about your system" >> $DEBUG | |
| 409 | + echo "---------------------------------------------" > $DEBUG | |
| 410 | + echo "* The following section contains information about your system" >> $DEBUG | |
| 411 | date >> $DEBUG | |
| 412 | - $ECHO "Output of uname -a" >> $DEBUG | |
| 413 | + echo "Output of uname -a" >> $DEBUG | |
| 414 | uname -a >> $DEBUG | |
| 415 | - $ECHO "---------------------------------------------" >> $DEBUG | |
| 416 | - $ECHO "* The following section contains information about your network" >> $DEBUG | |
| 417 | - $ECHO "* interfaces. The one you chose for PPPoE should contain the words:" >> $DEBUG | |
| 418 | - $ECHO "* 'UP' and 'RUNNING'. If it does not, you probably have an Ethernet" >> $DEBUG | |
| 419 | - $ECHO "* driver problem." >> $DEBUG | |
| 420 | - $ECHO "Output of ifconfig -a" >> $DEBUG | |
| 421 | + echo "---------------------------------------------" >> $DEBUG | |
| 422 | + echo "* The following section contains information about your network" >> $DEBUG | |
| 423 | + echo "* interfaces. The one you chose for PPPoE should contain the words:" >> $DEBUG | |
| 424 | + echo "* 'UP' and 'RUNNING'. If it does not, you probably have an Ethernet" >> $DEBUG | |
| 425 | + echo "* driver problem." >> $DEBUG | |
| 426 | + echo "Output of ifconfig -a" >> $DEBUG | |
| 427 | $IFCONFIG -a >> $DEBUG | |
| 428 | - $ECHO "---------------------------------------------" >> $DEBUG | |
| 429 | + echo "---------------------------------------------" >> $DEBUG | |
| 430 | if [ "`uname -s`" = "Linux" ] ; then | |
| 431 | - $ECHO "* The following section contains information about kernel modules" >> $DEBUG | |
| 432 | - $ECHO "* If the module for your Ethernet card is 'tulip', you might" >> $DEBUG | |
| 433 | - $ECHO "* want to look for an updated version at http://www.scyld.com" >> $DEBUG | |
| 434 | - $ECHO "Output of lsmod" >> $DEBUG | |
| 435 | + echo "* The following section contains information about kernel modules" >> $DEBUG | |
| 436 | + echo "* If the module for your Ethernet card is 'tulip', you might" >> $DEBUG | |
| 437 | + echo "* want to look for an updated version at http://www.scyld.com" >> $DEBUG | |
| 438 | + echo "Output of lsmod" >> $DEBUG | |
| 439 | lsmod >> $DEBUG | |
| 440 | - $ECHO "---------------------------------------------" >> $DEBUG | |
| 441 | + echo "---------------------------------------------" >> $DEBUG | |
| 442 | fi | |
| 443 | - $ECHO "* The following section lists your routing table." >> $DEBUG | |
| 444 | - $ECHO "* If you have an entry which starts with '0.0.0.0', you probably" >> $DEBUG | |
| 445 | - $ECHO "* have defined a default route and gateway, and pppd will" >> $DEBUG | |
| 446 | - $ECHO "* not create a default route using your ISP. Try getting" >> $DEBUG | |
| 447 | - $ECHO "* rid of this route." >> $DEBUG | |
| 448 | - $ECHO "Output of netstat -n -r" >> $DEBUG | |
| 449 | + echo "* The following section lists your routing table." >> $DEBUG | |
| 450 | + echo "* If you have an entry which starts with '0.0.0.0', you probably" >> $DEBUG | |
| 451 | + echo "* have defined a default route and gateway, and pppd will" >> $DEBUG | |
| 452 | + echo "* not create a default route using your ISP. Try getting" >> $DEBUG | |
| 453 | + echo "* rid of this route." >> $DEBUG | |
| 454 | + echo "Output of netstat -n -r" >> $DEBUG | |
| 455 | netstat -n -r >> $DEBUG | |
| 456 | - $ECHO "---------------------------------------------" >> $DEBUG | |
| 457 | - $ECHO "Contents of /etc/resolv.conf" >> $DEBUG | |
| 458 | - $ECHO "* The following section lists DNS setup." >> $DEBUG | |
| 459 | - $ECHO "* If you can browse by IP address, but not name, suspect" >> $DEBUG | |
| 460 | - $ECHO "* a DNS problem." >> $DEBUG | |
| 461 | + echo "---------------------------------------------" >> $DEBUG | |
| 462 | + echo "Contents of /etc/resolv.conf" >> $DEBUG | |
| 463 | + echo "* The following section lists DNS setup." >> $DEBUG | |
| 464 | + echo "* If you can browse by IP address, but not name, suspect" >> $DEBUG | |
| 465 | + echo "* a DNS problem." >> $DEBUG | |
| 466 | cat /etc/resolv.conf >> $DEBUG | |
| 467 | - $ECHO "---------------------------------------------" >> $DEBUG | |
| 468 | - $ECHO "* The following section lists /etc/ppp/options." >> $DEBUG | |
| 469 | - $ECHO "* You should have NOTHING in that file." >> $DEBUG | |
| 470 | - $ECHO "Contents of /etc/ppp/options" >> $DEBUG | |
| 471 | + echo "---------------------------------------------" >> $DEBUG | |
| 472 | + echo "* The following section lists /etc/ppp/options." >> $DEBUG | |
| 473 | + echo "* You should have NOTHING in that file." >> $DEBUG | |
| 474 | + echo "Contents of /etc/ppp/options" >> $DEBUG | |
| 475 | cat /etc/ppp/options >> $DEBUG 2>/dev/null | |
| 476 | - $ECHO "---------------------------------------------" >> $DEBUG | |
| 477 | + echo "---------------------------------------------" >> $DEBUG | |
| 478 | else | |
| 479 | DEBUG="" | |
| 480 | fi | |
| 481 | @@ -114,7 +113,7 @@ | |
| 482 | esac | |
| 483 | ||
| 484 | if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then | |
| 485 | - $ECHO "$ME: Cannot read configuration file '$CONFIG'" >& 2 | |
| 486 | + echo "$ME: Cannot read configuration file '$CONFIG'" >& 2 | |
| 487 | exit 1 | |
| 488 | fi | |
| 595e5f81 | 489 | export CONFIG |
| 09f22154 AM |
490 | @@ -134,7 +133,7 @@ |
| 491 | # Check if still running | |
| 492 | kill -0 $PID > /dev/null 2>&1 | |
| 493 | if [ $? = 0 ] ; then | |
| 595e5f81 | 494 | - $ECHO "$ME: There already seems to be a PPPoE connection up (PID $PID)" >& 2 |
| 495 | + echo "$ME: There already seems to be a PPPoE connection up (PID $PID)" >& 2 | |
| 09f22154 AM |
496 | exit 1 |
| 497 | fi | |
| 498 | # Delete bogus PIDFILE | |
| 595e5f81 | 499 | @@ -169,7 +168,7 @@ |
| 09f22154 AM |
500 | # Looks like the interface came up |
| 501 | if [ $? = 0 ] ; then | |
| 502 | # Print newline if standard input is a TTY | |
| 503 | - tty -s && $ECHO " Connected!" | |
| 504 | + tty -s && echo " Connected!" | |
| 505 | exit 0 | |
| 506 | fi | |
| 507 | ||
| 09f22154 AM |
508 | @@ -185,7 +184,7 @@ |
| 509 | fi | |
| 510 | done | |
| 511 | ||
| 512 | -$ECHO "TIMED OUT" >& 2 | |
| 513 | +echo "TIMED OUT" >& 2 | |
| 595e5f81 | 514 | # Timed out! Kill the pppoe-connect process and quit |
| 09f22154 AM |
515 | kill $CONNECT_PID > /dev/null 2>&1 |
| 516 | ||
| 595e5f81 | 517 | diff -urN rp-pppoe-3.7.orig/src/configure.in rp-pppoe-3.7/src/configure.in |
| 518 | --- rp-pppoe-3.7.orig/src/configure.in 2005-11-17 03:14:32.000000000 +0100 | |
| 519 | +++ rp-pppoe-3.7/src/configure.in 2005-12-21 17:35:35.000000000 +0100 | |
| 520 | @@ -184,7 +184,7 @@ | |
| 521 | AC_MSG_WARN([*** Oops! I couldn't find pppd, the PPP daemon anywhere.]) | |
| 522 | AC_MSG_WARN([*** You must install pppd, version 2.3.10 or later.]) | |
| 523 | AC_MSG_WARN([*** I will keep going, but it may not work.]) | |
| 524 | - PPPD=pppd | |
| 83254963 | 525 | + PPPD="/usr/sbin/pppd" |
| 6a572b09 AM |
526 | fi |
| 527 | ||
| 528 | dnl Figure out pppd version. 2.3.7 to 2.3.9 -- issue warning. Less than |