fix manual (book) build, add files/permissions for lp, compile postscript

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

diff --git a/rc/bin/inst/bootsetup b/rc/bin/inst/bootsetup
index 90d3389f1be328cec4af89a9632eb14d48d1689b..9e5c71d466cbf591e9d1e290120c8ad78a5cc79b 100755 (executable)
--- a/rc/bin/inst/bootsetup
+++ b/rc/bin/inst/bootsetup
@@ -19,22 +19,22 @@ case go
 
        if(! test -f /tmp/plan9.ini) {
                {
-                       echo bootfile'='9pcf
+                       echo 'bootfile=9pcf'
                        echo 'bootargs=local!'^$fs
                        echo 'mouseport='^$mouseport
                        echo 'monitor='^$monitor
                        echo 'vgasize='^$vgasize
+                       if(test -f '#ec/*nomp')
+                               echo '*nomp='
                } >/tmp/plan9.ini
        }
-       if(! test -f /tmp/plan9ini.bak)
-               cp /tmp/plan9.ini /tmp/plan9ini.bak
 
        need9fatformat=no
-       if(! isfat $fat)
+       if(! ~ `{fstype $fat} dos)
                need9fatformat=yes
        if(! test -f /srv/dos)
                dossrv
-       if not if(! mount -c /srv/dos /n/9fat /dev/$disk/9fat >[2]/dev/null)
+       if(! mount -c /srv/dos /n/9fat $fat >[2]/dev/null)
                need9fatformat=yes
        if not if(! test -f /n/9fat/plan9.ini)
                need9fatformat=yes
@@ -44,10 +44,7 @@ case go
                disk/format -r 2 -d -b /386/pbs $fat /n/newfs/386/9bootfat
                mount -c /srv/dos /n/9fat $fat
        }
-
        logprog cp /tmp/plan9.ini /n/9fat/plan9.ini
-       if(test -f /tmp/plan9ini.bak)
-               logprog cp /tmp/plan9ini.bak /n/9fat/plan9ini.bak
        logprog cp /n/newfs/386/9bootfat /n/9fat/9bootfat
        logprog cp /n/newfs/386/9pcf /n/9fat/9pcf
 
@@ -74,7 +71,8 @@ case go
 
 case checkdone
        xxxfat=(/dev/sd*/9fat)
-       if(! isfat $xxxfat(1) || ! ~ $didbootsetup 1){
+       xxxfat=$xxxfat(1)
+       if(! ~ `{fstype $xxxfat} dos || ! ~ $didbootsetup 1){
                bootsetup=ready
                export bootsetup
        }