From c9dc319649bd11aabbc3c235a0a9f94a70b4a452 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@centraldogma>
Date: Thu, 9 Jun 2011 04:56:16 +0000
Subject: remove bootes, fix inst/authsetup, use ndb for ipconfig before trying
 dhcp

---
 rc/bin/inst/authsetup | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

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

diff --git a/rc/bin/inst/authsetup b/rc/bin/inst/authsetup
index dc23e73b3..e4bea7dc3 100755
--- a/rc/bin/inst/authsetup
+++ b/rc/bin/inst/authsetup
@@ -1,36 +1,34 @@
 #!/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
-	}
 case go
 	echo
-	echo 'Setup keyfs and provide a password for the machine'
+	echo 'Invalidate nvram'
 	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,'
 	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. Remember the'
-	echo 'password, you will need to use it again when creating the'
-	echo 'bootes user on the auth server.'
+	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
 
 	authsetup=done
 	export authsetup
+case checkdone
+	if(~ $syst cpu && test -w $nvram && ! grep -s trust $nvram){
+		authsetup=ready
+		export authsetup
+	}
 }
-- 
cgit v1.2.3