inst: remove systype step. system will be terminal with a disk after installation.
This commit is contained in:
parent
c3c228a108
commit
1c379c1667
6 changed files with 4 additions and 86 deletions
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/rc
|
#!/bin/rc
|
||||||
|
|
||||||
# desc: create a boot floppy or configure hard disk to boot plan 9
|
# desc: create a boot floppy or configure hard disk to boot plan 9
|
||||||
# prereq: systype copydist
|
# prereq: copydist
|
||||||
|
|
||||||
fats=()
|
fats=()
|
||||||
for(i in /dev/sd*/9fat){
|
for(i in /dev/sd*/9fat){
|
||||||
|
@ -31,9 +31,6 @@ case go
|
||||||
export 9fat
|
export 9fat
|
||||||
|
|
||||||
if(! test -f /tmp/plan9.ini) {
|
if(! test -f /tmp/plan9.ini) {
|
||||||
if(~ $syst cpu)
|
|
||||||
bootfile=9pccpuf
|
|
||||||
if not
|
|
||||||
bootfile=9pcf
|
bootfile=9pcf
|
||||||
@{
|
@{
|
||||||
echo 'bootfile='^$bootfile
|
echo 'bootfile='^$bootfile
|
||||||
|
|
|
@ -12,7 +12,6 @@ echo -n 'Preparing menu...'
|
||||||
|
|
||||||
# must be topologically sorted (by prereq)
|
# must be topologically sorted (by prereq)
|
||||||
tasks=(\
|
tasks=(\
|
||||||
systype\
|
|
||||||
configfs\
|
configfs\
|
||||||
partdisk prepdisk\
|
partdisk prepdisk\
|
||||||
mountfs\
|
mountfs\
|
||||||
|
@ -21,7 +20,7 @@ tasks=(\
|
||||||
mountdist\
|
mountdist\
|
||||||
download\
|
download\
|
||||||
copydist\
|
copydist\
|
||||||
ndbsetup nvramsetup\
|
ndbsetup\
|
||||||
tzsetup\
|
tzsetup\
|
||||||
bootsetup\
|
bootsetup\
|
||||||
finish\
|
finish\
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#!/bin/rc
|
#!/bin/rc
|
||||||
|
|
||||||
# desc: choose and mount file system partition
|
# desc: choose and mount file system partition
|
||||||
# prereq: systype
|
|
||||||
|
|
||||||
service=cwfs
|
service=cwfs
|
||||||
|
|
||||||
|
@ -65,12 +64,7 @@ case go
|
||||||
{
|
{
|
||||||
echo service $service
|
echo service $service
|
||||||
echo config $fs
|
echo config $fs
|
||||||
|
|
||||||
if(! ~ $syst cpu){
|
|
||||||
# new config option
|
|
||||||
echo noauth
|
echo noauth
|
||||||
}
|
|
||||||
|
|
||||||
echo filsys main c'('$fs')('$fsworm')'
|
echo filsys main c'('$fs')('$fsworm')'
|
||||||
echo filsys dump o
|
echo filsys dump o
|
||||||
if(! ~ $fsother ''){
|
if(! ~ $fsother ''){
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#!/bin/rc
|
#!/bin/rc
|
||||||
|
|
||||||
# desc: choose and mount file system partition
|
# desc: choose and mount file system partition
|
||||||
# prereq: systype
|
|
||||||
|
|
||||||
service=hjfs
|
service=hjfs
|
||||||
|
|
||||||
|
|
|
@ -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
|
|
||||||
}
|
|
|
@ -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
|
|
||||||
}
|
|
Loading…
Reference in a new issue