merge

diff --cc rc/bin/inst/authsetup
index b274969a37d4cea82f2ae8c1f30a878d532f7469,ca3678ea3d801ea59bde953c0b3bbd681eb8bf9c..ccddc00ec048d674488434a90e07cf2066e2d207
--- 1/rc/bin/inst/authsetup
--- 2/rc/bin/inst/authsetup
+++ b/rc/bin/inst/authsetup
@@@ -1,18 -1,25 +1,14 @@@
  #!/bin/rc
  
 -# desc: set system password for auth, invalidate nvram
 +# desc: invalidate nvram
  # prereq: systype copydist
  
 -nvram=`{echo `{basename -d $fs}^/nvram}
 +nvram=(/dev/sd*/nvram)
 +nvram=$nvram(1)
  
 -switch($1) {
 -case checkdone
 -      if(! ~ $syst cpu || ! grep trust $nvram){
 -              authsetup=ready
 -              export authsetup
 -      }
 +switch($1){
  case go
--      echo
-       echo 'Invalidate nvram'
 -      echo 'Setup keyfs and provide a password for the machine'
--      echo
 -
 -      auth/keyfs
--
 -      if(! grep trust $nvram)
 -              echo 'trust, but verify' >$nvram >[2=1]
 +      echo 'trust, but verify' >$nvram
  
        echo
        echo 'You will be asked to enter an authid, authdom, secstore key,'