1 files changed, 7 insertions, 47 deletions

diff --git a/release/picobsd/dial/lang/dialup.en b/release/picobsd/dial/lang/dialup.en
index 23b5d8ee8d98..918c6703ce96 100755
--- a/release/picobsd/dial/lang/dialup.en
+++ b/release/picobsd/dial/lang/dialup.en
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: dialup.en,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
+# $Id: dialup.en,v 1.3 1998/08/07 19:29:57 abial Exp $
 set_resolv() {
 	echo ""
 	echo "                       Default Domain Name"
@@ -163,19 +163,7 @@ do
 	echo "floppy!!! If you don't like it... well, you must dial in manually."
 	echo "In that case abort this script (Ctrl-C). Otherwise, continue."
 	echo ""
-	stty -echo
 	read -p "Please enter your password: " pass
-	echo ""
-	read -p "Enter again your password: " pass1
-	stty echo
-	echo ""
-	if [ "X${pass}" != "X${pass1}" ]
-	then
-		echo "Passwords didn't match! Press Enter to continue..."
-		read junk
-		pass=""
-		set_password
-	fi
 done
 }
 
@@ -190,21 +178,22 @@ do
 	echo "1)	......login: ${user}"
 	echo "	...password: ********"
 	echo "		(terminal server starts PPP here)"
+	echo ""
 	echo "2)	......login: ${user}"
 	echo "	...password: ********"
 	echo "	...protocol: ppp"
 	echo "		(terminal server starts PPP here)"
+	echo ""
 	echo "3)	......username: ${user}"
 	echo "	......password: ********"
 	echo "		(terminal server starts PPP here)"
+	echo ""
 	echo "4)	......username: ${user}"
 	echo "	......password: ********"
 	echo "	portX/..xxx...: ppp"
 	echo "		(terminal server starts PPP here)"
-	echo "5)	Use CHAP to log in."
-	echo "6)	Use PAP to log in."
 	echo ""
-	read -p "Choose 1,2,3,4,5 or 6: " chat
+	read -p "Choose 1,2,3 or 4: " chat
 	case ${chat} in
 	1)
 		chat1="TIMEOUT 10 ogin:--ogin: ${user} word: \\\\P"
@@ -222,12 +211,6 @@ do
 		chat1="TIMEOUT 10 ername:--ername: ${user} word: \\\\P port ppp"
 		chat2="username/password/port"
 		;;
-	5)	chat1="-"
-		chat2="CHAP"
-		;;
-	6)	chat1="-"
-		chat2="PAP"
-		;;
 	*)	echo "Bad value! Please choose 1,2,3 or 4."
 		echo ""
 		unset chat
@@ -338,12 +321,7 @@ echo " set speed ${speed}" >>/etc/ppp/ppp.conf
 echo " set phone ${phone}" >>/etc/ppp/ppp.conf
 echo " set authkey ${pass}" >>/etc/ppp/ppp.conf
 echo " set timeout ${timo}" >>/etc/ppp/ppp.conf
-if [ "X${chat1}" = "-" ]
-then
-	echo " set authname ${user}" >>/etc/ppp/ppp.conf
-else
-	echo " set login \"${chat1}\"" >>/etc/ppp/ppp.conf
-fi
+echo " set login \"${chat1}\"" >>/etc/ppp/ppp.conf
 echo " set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.0 0.0.0.0" >>/etc/ppp/ppp.conf
 
 echo " Done."
@@ -366,30 +344,12 @@ echo ""
 echo "Now, if you're sure that your /etc/ppp/ppp.conf file is ok (which is"
 echo -n "probable :-) would you like to start the dialup connection now? (y/n) "
 read ans
-opts=""
 while [ "X${ans}" = "Xy" ]
 do
 	echo ""
-	if [ "X${opts}" = "X" ]
-	then
-		echo "We'll use the following arguments to 'ppp':"
-		echo ""
-		echo "		ppp -background dialup"
-		echo "
-		echo -n "Would you like to change them? (y/n) "
-		read oo
-		if [ "X${oo}" = "Xy" ]
-		then
-			read -p "Enter ppp arguments here: " opts
-		else
-			opts="-background dialup"
-		fi
-		echo ""
-		echo ""
-	fi
 	echo "Starting dialup connection. Wait until you see a 'PPP Enabled' message..."
 	echo ""
-	ppp ${opts}
+	ppp -background dialup
 	if [ "X$?" != "X0" ]
 	then
 		echo ""