inst: get rid of ppp configuration

[plan9front.git] / rc / bin / inst / main

diff --git a/rc/bin/inst/main b/rc/bin/inst/main
index de805bac3f565059ff02fd80b1b0380b6c39c058..4a3eb8bf869233c6e04c6d47dc3271295a27b220 100755 (executable)
--- 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
 }