2 files changed, 7 insertions, 19 deletions

diff --git a/release/instdist.sh b/release/instdist.sh
index 1ee8ad42bd54b..1dbc5103e4c6b 100644
--- a/release/instdist.sh
+++ b/release/instdist.sh
@@ -10,7 +10,7 @@
 # putting your name on top after doing something trivial like reindenting
 # it, just to make it look like you wrote it!).
 #
-# $Id: instdist.sh,v 1.40 1994/12/02 21:15:19 jkh Exp $
+# $Id: instdist.sh,v 1.41 1994/12/04 03:41:18 jkh Exp $
 
 if [ "${_INSTINST_SH_LOADED_}" = "yes" ]; then
 	return 0
@@ -101,12 +101,12 @@ binary set are only guaranteed to be available from the Primary site." \
    "U.S-2" "ftp://ftp.dataplex.net/pub/FreeBSD/${DISTNAME}" \
    "U.S-3" "ftp://kryten.atinc.com/pub/FreeBSD/${DISTNAME}" \
    "U.S-4" "ftp://ref.tfs.com/pub/FreeBSD/${DISTNAME}" \
-   "Holland" "ftp://ftp.nl.net:/pub/os/FreeBSD/${DISTNAME}" \
+   "Holland" "ftp://ftp.nl.net/pub/os/FreeBSD/${DISTNAME}" \
    "Israel" "ftp://orgchem.weizmann.ac.il/pub/FreeBSD-${DISTNAME}" \
    "Taiwan" "ftp://netbsd.csie.nctu.edu.tw/pub/FreeBSD/${DISTNAME}" \
    "Australia" "ftp://ftp.physics.usyd.edu.au/FreeBSD/${DISTNAME}" \
    "France" "ftp://ftp.ibp.fr/pub/FreeBSD/${DISTNAME}" \
-   "Finland" "ftp://nic.funet.fi:/pub/unix/FreeBSD/${DISTNAME}" \
+   "Finland" "ftp://nic.funet.fi/pub/unix/FreeBSD/${DISTNAME}" \
    "Russia" "ftp://ftp.kiae.su/FreeBSD/${DISTNAME}" \
    "Japan" "ftp://ftp.sra.co.jp/pub/os/FreeBSD/distribution/${DISTNAME}" \
    "Japan-2" "ftp://ftp.mei.co.jp/free/PC-UNIX/FreeBSD/${DISTNAME}" \
@@ -124,12 +124,12 @@ binary set are only guaranteed to be available from the Primary site." \
    U.S-2) FTP_PATH="ftp://ftp.dataplex.net/pub/FreeBSD/${DISTNAME}" ;;
    U.S-3) FTP_PATH="ftp://kryten.atinc.com/pub/FreeBSD/${DISTNAME}" ;;
    U.S-4) FTP_PATH="ftp://ref.tfs.com/pub/FreeBSD/${DISTNAME}" ;;
-   Holland) FTP_PATH="ftp://ftp.nl.net:/pub/os/FreeBSD/${DISTNAME}" ;;
+   Holland) FTP_PATH="ftp://ftp.nl.net/pub/os/FreeBSD/${DISTNAME}" ;;
    Israel) FTP_PATH="ftp://orgchem.weizmann.ac.il/pub/FreeBSD-${DISTNAME}" ;;
    Taiwan) FTP_PATH="ftp://netbsd.csie.nctu.edu.tw/pub/FreeBSD/${DISTNAME}" ;;
    Australia) FTP_PATH="ftp://ftp.physics.usyd.edu.au/FreeBSD/${DISTNAME}" ;;
    France) FTP_PATH="ftp://ftp.ibp.fr/pub/FreeBSD/${DISTNAME}" ;;
-   Finland) FTP_PATH="ftp://nic.funet.fi:/pub/unix/FreeBSD/${DISTNAME}" ;;
+   Finland) FTP_PATH="ftp://nic.funet.fi/pub/unix/FreeBSD/${DISTNAME}" ;;
    Japan) FTP_PATH="ftp://ftp.sra.co.jp/pub/os/FreeBSD/distribution/${DISTNAME}" ;;
    Japan-2) FTP_PATH="ftp://ftp.mei.co.jp/free/PC-UNIX/FreeBSD/${DISTNAME}" ;;
    Japan-3) FTP_PATH="ftp://ftp.waseda.ac.jp/pub/FreeBSD/${DISTNAME}" ;;
diff --git a/release/netinst.sh b/release/netinst.sh
index 60b9681730756..41e0c90ff831f 100644
--- a/release/netinst.sh
+++ b/release/netinst.sh
@@ -10,7 +10,7 @@
 # putting your name on top after doing something trivial like reindenting
 # it, just to make it look like you wrote it!).
 #
-# $Id: netinst.sh,v 1.15 1994/12/02 21:05:27 jkh Exp $
+# $Id: netinst.sh,v 1.16 1994/12/05 00:13:11 ache Exp $
 
 if [ "${_NETINST_SH_LOADED_}" = "yes" ]; then
 	return 0
@@ -139,10 +139,9 @@ network_setup()
 	while [ "${INTERFACE}" = "" ]; do
 		dialog --title "Set up network interface" --menu \
 		  "Please select the type of network connection you have:\n" \
-		  -1 -1 4 \
+		  -1 -1 3 \
 		"Ether" "A supported ethernet card" \
 		"SLIP" "A point-to-point SLIP (Serial Line IP) connection" \
-		"PPP" "A Point-To-Point-Protocol connection" \
 		"PLIP" "A Parallel-Line IP setup (with standard laplink cable)" \
 		2> ${TMP}/menu.tmp.$$
 
@@ -153,9 +152,6 @@ network_setup()
 		case ${CHOICE} in
 		Ether)	if ! network_setup_ether; then continue; fi ;;
 		SLIP)	if ! network_setup_serial sl0; then continue; fi ;;
-
-		PPP)	if ! network_setup_serial ppp0; then continue; fi ;;
-
 		PLIP)	if ! network_setup_plip; then continue; fi ;;
 		esac
 		if [ "${INTERFACE}" = "" ]; then continue; fi
@@ -188,14 +184,6 @@ network_setup()
 			${SLATTACH_CMD} ${SLATTACH_FLAGS} ${SERIAL_SPEED} ${SERIAL_INTERFACE}
 			progress ${SLATTACH_CMD} ${SLATTACH_FLAGS} ${SERIAL_SPEED} ${SERIAL_INTERFACE}
 		fi
-		if [ "${INTERFACE}" = "ppp0" ]; then
-			DEFAULT_VALUE=${PPPD_FLAGS}
-			if network_dialog "Set extra flags to ${PPPD}?"; then
-				PPPD_FLAGS=${ANSWER}
-			fi
-			${PPPD_CMD} ${PPPD_FLAGS} ${SERIAL_INTERFACE} ${SERIAL_SPEED} ${IPADDR}:${REMOTE_IPADDR}
-			progress ${PPPD_CMD} ${PPPD_FLAGS} ${SERIAL_INTERFACE} ${SERIAL_SPEED} ${IPADDR}:${REMOTE_IPADDR}
-		fi
 		echo "${IPADDR} ${REMOTE_IPADDR} netmask ${NETMASK} ${IFCONFIG_FLAGS}" > ${ETC}/hostname.${INTERFACE}
 		DEFAULT_VALUE=""
 		if network_dialog "If you have a default gateway, enter its IP address"; then