ref: 68f55577ce3a14c3f7a94db25fbd291ff44d8213
parent: ca946d7fb05d5fd954cd3b73d38090e378c294a8
author: cinap_lenrek <cinap_lenrek@gmx.de>
date: Thu Aug 1 23:47:27 EDT 2013
inst: remove systype step. system will be terminal with a disk after installation.
--- 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 @@
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
--- a/rc/bin/inst/main
+++ b/rc/bin/inst/main
@@ -12,7 +12,6 @@
# must be topologically sorted (by prereq)
tasks=(\
- systype\
configfs\
partdisk prepdisk\
mountfs\
@@ -21,7 +20,7 @@
mountdist\
download\
copydist\
- ndbsetup nvramsetup\
+ ndbsetup\
tzsetup\
bootsetup\
finish\
--- 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 @@
{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 ''){--- 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
--- a/rc/bin/inst/nvramsetup
+++ /dev/null
@@ -1,51 +1,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
-}
--- a/rc/bin/inst/systype
+++ /dev/null
@@ -1,20 +1,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
-}
--
⑨