inst: remove systype step. system will be terminal with a disk after installation.

6 files changed, 4 insertions, 86 deletions

diff --git a/rc/bin/inst/bootsetup b/rc/bin/inst/bootsetup
index 85b79a49c..d68989adb 100755
--- a/rc/bin/inst/bootsetup
+++ b/rc/bin/inst/bootsetup
@@ -1,7 +1,7 @@
 #!/bin/rc
 
 # desc: create a boot floppy or configure hard disk to boot plan 9
-# prereq: systype copydist
+# prereq: copydist
 
 fats=()
 for(i in /dev/sd*/9fat){
@@ -31,10 +31,7 @@ case go
 	export 9fat
 
 	if(! test -f /tmp/plan9.ini) {
-		if(~ $syst cpu)
-			bootfile=9pccpuf
-		if not
-			bootfile=9pcf
+		bootfile=9pcf
 		@{
 			echo 'bootfile='^$bootfile
 			echo 'bootargs=local!'^$fs' '$"fsflags
diff --git a/rc/bin/inst/main b/rc/bin/inst/main
index 413908455..bee680ebf 100755
--- a/rc/bin/inst/main
+++ b/rc/bin/inst/main
@@ -12,7 +12,6 @@ echo -n 'Preparing menu...'
 
 # must be topologically sorted (by prereq)
 tasks=(\
-	systype\
 	configfs\
 	partdisk prepdisk\
 	mountfs\
@@ -21,7 +20,7 @@ tasks=(\
 	mountdist\
 	download\
 	copydist\
-	ndbsetup nvramsetup\
+	ndbsetup\
 	tzsetup\
 	bootsetup\
 	finish\
diff --git a/rc/bin/inst/mountcwfs b/rc/bin/inst/mountcwfs
index 92ca70f10..8a203ef53 100755
--- a/rc/bin/inst/mountcwfs
+++ b/rc/bin/inst/mountcwfs
@@ -1,7 +1,6 @@
 #!/bin/rc
 
 # desc: choose and mount file system partition
-# prereq: systype
 
 service=cwfs
 
@@ -65,12 +64,7 @@ case go
 			{
 				echo service $service
 				echo config $fs
-
-				if(! ~ $syst cpu){
-					# new config option
-					echo noauth
-				}
-
+				echo noauth
 				echo filsys main c'('$fs')('$fsworm')'
 				echo filsys dump o
 				if(! ~ $fsother ''){
diff --git a/rc/bin/inst/mounthjfs b/rc/bin/inst/mounthjfs
index e47d556d5..d0083978e 100755
--- a/rc/bin/inst/mounthjfs
+++ b/rc/bin/inst/mounthjfs
@@ -1,7 +1,6 @@
 #!/bin/rc
 
 # desc: choose and mount file system partition
-# prereq: systype
 
 service=hjfs
 
diff --git a/rc/bin/inst/nvramsetup b/rc/bin/inst/nvramsetup
deleted file mode 100755
index 75f5385a3..000000000
--- a/rc/bin/inst/nvramsetup
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/rc
-
-# desc: invalidate nvram
-# prereq: systype copydist
-
-files=()
-for(i in /dev/sd*/nvram){
-	if(test -f $i)
-		files=($files $i)
-}
-
-switch($1){
-case checkdone checkready
-	if(~ $#files 0 && ! ~ $syst cpu)
-		nvramsetup=done
-	if not {
-		if(~ $#nvram 1 && grep -s trust $nvram)
-			nvramsetup=done
-		if not
-			nvramsetup=ready
-	}
-	export nvramsetup
-
-case go
-	echo
-	echo 'Setup Plan 9 NVRAM configuration partition (nvram)'
-	echo
-
-	if(~ $#files 1)
-		default=(-d $files)
-	if not
-		default=()
-	prompt $default 'Nvram partition' $files
-	nvram=$rd
-	export nvram
-
-	echo 'trust, but verify' >$nvram
-
-	if(! ~ $syst cpu)
-		exit
-
-	echo
-	echo 'You will be asked to enter an authid, authdom, secstore key,'
-	echo 'and password upon next boot. The authid is the hostowner.'
-	echo 'The authdom is the domain from your network configuration.'
-	echo 'The secstore key and password should be a secret password'
-	echo 'of eight characters or greater in length. On an auth server,'
-	echo 'the password will be used to encrypt the user database'
-	echo '/adm/keys'
-	echo
-}
diff --git a/rc/bin/inst/systype b/rc/bin/inst/systype
deleted file mode 100755
index 42a9a01b1..000000000
--- a/rc/bin/inst/systype
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/rc
-
-# desc: choose system type
-
-switch($1){
-case checkdone
-	if(~ $#syst 1 && ~ $syst cpu terminal)
-		systype=done
-	if not
-		systype=ready
-	export systype
-case go
-	echo
-
-	options=(terminal cpu)
-	
-	prompt -d terminal 'System type' $options
-	syst=$rd
-	export syst
-}