ref: 155fd0aca565cea7e1c42d40830247352d6daeff
parent: c0b8ea56068578ce3e39147497aef4f8f0aaa2ab
author: cinap_lenrek <cinap_lenrek@centraldogma>
date: Thu Apr 28 18:38:29 EDT 2011
inst: ask to ream filesystem, use 16K blocksize for copydist, fix missed mount in bootsetup
--- a/rc/bin/inst/bootsetup
+++ b/rc/bin/inst/bootsetup
@@ -24,10 +24,9 @@
echo 'mouseport='^$mouseport
echo 'monitor='^$monitor
echo 'vgasize='^$vgasize
+ echo '*nomp=1'
} >/tmp/plan9.ini
}
- if(! test -f /tmp/plan9ini.bak)
- cp /tmp/plan9.ini /tmp/plan9ini.bak
need9fatformat=no
if(! isfat $fat)
@@ -34,7 +33,7 @@
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 +43,7 @@
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
--- a/rc/bin/inst/copydist
+++ b/rc/bin/inst/copydist
@@ -17,7 +17,7 @@
}
case go
rm -f /tmp/copydone
- disk/mkfs -s /n/dist -d /n/newfs /sys/lib/sysconfig/proto/allproto
+ disk/mkfs -z 16384 -p -s /n/dist -d /n/newfs /sys/lib/sysconfig/proto/allproto
touch /tmp/copydone
case checkdone
--- a/rc/bin/inst/mountcwfs
+++ b/rc/bin/inst/mountcwfs
@@ -44,34 +44,51 @@
fsother=$rd
export fsother
- if(! test -f /tmp/fsconfig){- {- echo service cwfs
- echo config $fs
+ ream=no
+ if(! ~ $fstype `{fstype $fs})+ ream=yes
+ prompt -d $ream 'Ream the filesystem?' yes no
+ ream=$rd
- # new config option
- echo noauth
-
- echo filsys main c'('$fs')('$fsworm')'- echo filsys dump o
- if(! ~ $fsother ''){- echo filsys other '('$fsother')'- echo ream other
- }
- echo ream main
- echo end
- } >/tmp/fsconfig
- }
-
log Starting $fstype file server for $fs
unmount /n/newfs >[2]/dev/null
echo halt >>/srv/cwfs.cmd >[2]/dev/null
rm -f /srv/cwfs /srv/cwfs.cmd
- if(! $fstype -c -f $fs </tmp/fsconfig){- mountfs=ready
- export mountfs
- exit oops
+
+ if(~ $ream yes){+ if(! test -f /tmp/fsconfig){+ {+ echo service cwfs
+ echo config $fs
+
+ # new config option
+ echo noauth
+
+ echo filsys main c'('$fs')('$fsworm')'+ echo filsys dump o
+ if(! ~ $fsother ''){+ echo filsys other '('$fsother')'+ echo ream other
+ }
+ echo ream main
+ echo end
+ } >/tmp/fsconfig
+ }
+ echo 'Reaming filesystem'
+ if(! $fstype -f $fs -c </tmp/fsconfig){+ mountfs=ready
+ export mountfs
+ exit oops
+ }
}
+ if not {+ echo 'Entering manual configuration mode. when done, type end'
+ if(! $fstype -n cwfs -f $fs -c){+ mountfs=ready
+ export mountfs
+ exit oops
+ }
+ }
log Configuering $fstype file server for $fs
{@@ -91,9 +108,8 @@
echo create /usr/$user/tmp $user $user 750 d
echo cfs main
}
- # not synchronized
- sleep 5
} >>/srv/cwfs.cmd
+ sleep 5
log Mounting $fstype file server for $fs
if(! logprog mount -c /srv/cwfs /n/newfs){--
⑨