From caddc9a6ea0c8aeb2510ec9eda67eb4f2e82a00c Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Fri, 4 Aug 2017 14:18:40 +0200
Subject: inst: get rid of ppp configuration

---
 rc/bin/inst/confignet | 50 ++++++++++----------------------------------------
 1 file changed, 10 insertions(+), 40 deletions(-)

(limited to 'rc/bin/inst/confignet')

diff --git a/rc/bin/inst/confignet b/rc/bin/inst/confignet
index f516de7b0..b6b738fa8 100755
--- a/rc/bin/inst/confignet
+++ b/rc/bin/inst/confignet
@@ -9,7 +9,7 @@ case checkready checkdone
 		export confignet
 		exit
 	}
-	if(~ $netisfrom ppp ether){
+	if(~ $netisfrom ether){
 		x=config$netisfrom
 		$x=done
 		./config$netisfrom checkdone
@@ -22,48 +22,18 @@ case checkready checkdone
 	exit
 
 case go
-	devs=''
-	if(test -d /net/ether0 >[2]/dev/null)
-		devs=$devs^ether
-	if(test -f /dev/eia? >[2]/dev/null)
-		devs=$devs^ppp
-	
-	switch($devs){
-	case ''
+	if(! test -d /net/ether0 >[2]/dev/null){
 		echo
-		echo 'Could not find ethernet card nor serial port nor modem.'
+		echo 'Could not find ethernet card.'
 		echo
 		netisfrom=none
-	
-	case ppp
-		echo
-		echo 'No ethernet card was detected, but there is a serial port or modem.'
-		echo 'We will configure PPP.'
-		echo
-		netisfrom=ppp
-	
-	case ether
-		echo
-		echo 'No serial port or modem detected, but there is an ethernet card.'
-		echo 'We will configure the ethernet.'
-		echo
-		netisfrom=ether
-	
-	case etherppp
-		echo
-		echo 'You can connect to the internet via'
-		echo 'a local ethernet or a dial-up PPP connection.'
-		echo
-		prompt -d ether 'Interface to use' ether ppp
-		netisfrom=$rd
+		export netisfrom
+		exit
 	}
-	
+	echo
+	echo 'We will configure the ethernet.'
+	echo
+	netisfrom=ether
 	export netisfrom
-	if(~ $netisfrom ether ppp)
-		exec ./config$netisfrom go
-
-	if(! test -f /srv/cs && ! test -f /net/cs)
-		ndb/cs
-	if(! test -f /srv/dns && ! test -f /net/dns)
-		ndb/dns -r
+	exec ./configether go
 }
-- 
cgit v1.2.3