X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=rc%2Fbin%2Finst%2Fmain;h=4a3eb8bf869233c6e04c6d47dc3271295a27b220;hb=f777f7c4211100c0a0ae0c25f668523dc21a5677;hp=de805bac3f565059ff02fd80b1b0380b6c39c058;hpb=c504f717e22bb72f337484df0fc0d7fe1dac2b8f;p=plan9front.git

diff --git a/rc/bin/inst/main b/rc/bin/inst/main
index de805bac3..4a3eb8bf8 100755
--- a/rc/bin/inst/main
+++ b/rc/bin/inst/main
@@ -1,6 +1,6 @@
 #!/bin/rc
 
-. defs
+. ./defs
 
 while()
 {
@@ -12,7 +12,6 @@ echo -n 'Preparing menu...'
 
 # must be topologically sorted (by prereq)
 tasks=(\
-	systype\
 	configfs\
 	partdisk prepdisk\
 	mountfs\
@@ -21,10 +20,10 @@ tasks=(\
 	mountdist\
 	download\
 	copydist\
-	ndbsetup nvramsetup\
+	ndbsetup\
 	tzsetup\
-	bootsetup finish stop\
-	stopether stopppp\
+	bootsetup\
+	finish\
 )
 
 # these don't show up in the menu but still matter
@@ -58,7 +57,7 @@ for(i in $tasks) {
 			$i=notdone
 	if(~ $$i done) {
 		export $i
-		$i checkdone
+		./$i checkdone
 		$i=`{grep '^'$i^'=' /tmp/vars | sed -n '$p' | sed 's/.*=//'}
 	}
 
@@ -71,7 +70,7 @@ for(i in $tasks) {
 		case yes
 			$i=ready
 			export $i
-			$i checkready
+			./$i checkready
 			$i=`{grep '^'$i^'=' /tmp/vars | sed -n '$p' | sed 's/.*=//'}
 		case no
 			$i=notdone
@@ -109,7 +108,7 @@ prompt -d $ready(1) -w '' 'Task to do' $done $ready
 echo
 echo $div
 
-$rd go
+./$rd go
 $rd=done		# if it's not, the check will figure that out
 export $rd
 }