Now the installer should fit to be integrated into the distribution. Changes: * /n/fossil -> /n/newfs * kfs support added * ext2 support is commented out, because ext2srv does not fit onto the floppy. * fossil mountdist support works * on mountdist, the bins of it are binded into the /bin of the floppy * fmtventi does bind its binaries in /bin/venti * some /n paths are removed * the $wsys error is now fixed in textonly install * fixed pcflop to include loopback device Notes: Fri Apr 1 08:06:21 EST 2005 rsc I applied the patch. Could you please pull from sources, replace kfs with ext2, and submit a patch with that change? I think the people who need to reinstall from old kfs partitions have done so, and supporting ext2 should appeal to more prospective users. Thanks. Reference: /n/sources/patch/applied/install-restructurised Date: Thu Mar 31 16:07:34 CES 2005 Reviewed-by: rsc --- /sys/lib/dist/pc/proto Thu Mar 31 15:46:59 2005 +++ /sys/lib/dist/pc/proto Thu Mar 31 15:46:55 2005 @@ -23,8 +23,8 @@ disk d555 sys sys fdisk 555 sys sys format 555 sys sys -# kfs 555 sys sys -# kfscmd 555 sys sys + kfs 555 sys sys + kfscmd 555 sys sys mbr 555 sys sys prep 555 sys sys fossil d555 sys sys @@ -46,11 +46,11 @@ compactdb 555 sys sys /sys/lib/dist/pc/sub/compactdb pull 555 sys sys venti d555 sys sys -#VENTI venti 555 sys sys -#VENTI conf 555 sys sys -#VENTI fmtarenas 555 sys sys -#VENTI fmtindex 555 sys sys -#VENTI fmtisect 555 sys sys +# venti 555 sys sys +# conf 555 sys sys +# fmtarenas 555 sys sys +# fmtindex 555 sys sys +# fmtisect 555 sys sys 9660srv 555 sys sys # acme could go # acme 555 sys sys @@ -73,8 +73,8 @@ ed 555 sys sys # if cpu goes, exportfs could go # exportfs 555 sys sys - ext2srv 555 sys sys - fcp 555 sys sys +# ext2srv 555 sys sys + fcp 555 sys sys grep 555 sys sys hget 555 sys sys hoc 555 sys sys @@ -132,10 +132,8 @@ c: d000 sys sys c d000 sys sys 9fat d000 sys sys - 9 d000 sys sys - kfs d000 sys sys /sys/lib/dist/pc/empty kremvax d000 sys sys /sys/lib/dist/pc/empty - fossil d000 sys sys + newfs d000 sys sys dist d000 sys sys /sys/lib/dist/pc/empty distmedia d000 sys sys /sys/lib/dist/pc/empty rc d555 sys sys --- /sys/lib/dist/pc/inst/bootfloppy Thu Mar 31 15:47:16 2005 +++ /sys/lib/dist/pc/inst/bootfloppy Thu Mar 31 15:47:12 2005 @@ -33,7 +33,7 @@ log Formatting boot floppy disk/format -b /386/pbs \ - -fd $adisk /n/kfs/386/9load /n/kfs/386/9pcdisk.gz \ + -fd $adisk /n/newfs/386/9load /n/newfs/386/9pcdisk.gz \ /tmp/plan9ini.bak x=$status --- /sys/lib/dist/pc/inst/bootsetup Thu Mar 31 15:47:38 2005 +++ /sys/lib/dist/pc/inst/bootsetup Thu Mar 31 15:47:34 2005 @@ -31,6 +31,10 @@ echo bootfile'='$bootfs!/386/9pcdisk echo 'bootdisk=local!'^$sfs } + if(~ $fstype fossil+venti){ + venti=`{echo $ventiarena | sed 's;/dev;#S;'} + echo venti'='^$venti + } grep -v '(^\[)|menuitem|adisk|bootfile|bootdisk|bootargs|nobootprompt|mouseport|vgasize|monitor|cdboot' /tmp/plan9.orig echo 'mouseport='^$mouseport echo 'monitor='^$monitor @@ -51,7 +55,7 @@ if(~ $need9fatformat yes){ log Initializing Plan 9 FAT partition. disk/format -r 2 -d -b /386/pbs \ - /dev/$disk/9fat /n/kfs/386/9load + /dev/$disk/9fat /n/newfs/386/9load # silently install pbslba if the partition is way into the disk. # it''s our only hope. only need this for >8.5GB into the disk. # but... @@ -73,8 +77,8 @@ } if(! test -f /n/9fat/4e){ - logprog cp /n/kfs/386/9load /n/9fat/9load - logprog cp /n/kfs/386/9pcf /n/9fat/9pcf + logprog cp /n/newfs/386/9load /n/9fat/9load + logprog cp /n/newfs/386/9pcf /n/9fat/9pcf if(test -f /n/9fat/plan9.ini && ! test -f /n/9fat/plan9-3e.ini) logprog mv /n/9fat/plan9.ini /n/9fat/plan9-3e.ini if(test -f /n/9fat/9pcdisk && ! test -f /n/9fat/9pc3e) --- /sys/lib/dist/pc/inst/bootwin9x Thu Mar 31 15:48:02 2005 +++ /sys/lib/dist/pc/inst/bootwin9x Thu Mar 31 15:47:59 2005 @@ -23,7 +23,7 @@ exit bad } -if(! cp /n/kfs/386/^(9load ld.com 9pcdisk) /tmp/plan9ini.bak /n/c:/plan9) { +if(! cp /n/newfs/386/^(9load ld.com 9pcdisk) /tmp/plan9ini.bak /n/c:/plan9) { echo 'Could not copy Plan 9 boot files into /n/c:/plan9.' exit bad } --- /sys/lib/dist/pc/inst/configfs Thu Mar 31 15:48:31 2005 +++ /sys/lib/dist/pc/inst/configfs Thu Mar 31 15:48:27 2005 @@ -4,7 +4,7 @@ switch($1){ case checkdone - if(! ~ $fstype kfs fossil){ + if(! ~ $fstype fossil fossil+venti){ configfs=ready export configfs } @@ -12,13 +12,13 @@ case go echo 'You can install the following types of file systems:' echo - echo ' fossil an archival (dump) file server' - echo ' kfs the old Plan 9 on-disk file server' + echo ' fossil the new Plan9 fileserver' + echo ' fossil+venti fossil + a archival dump server' echo - echo 'If you choose to install fossil, you can add Venti later,' - echo 'assuming you leave enough disk space for it.' - echo - prompt -d fossil 'File system' fossil kfs + echo '(fossil+venti only reserves and formats the partitions' + echo ' venti will need, but it will be started on the first' + echo ' boot.)' + prompt -d fossil 'File system' fossil fossil+venti fstype=$rd export fstype } --- /sys/lib/dist/pc/inst/copydist Thu Mar 31 15:49:03 2005 +++ /sys/lib/dist/pc/inst/copydist Thu Mar 31 15:48:59 2005 @@ -10,7 +10,7 @@ export copydist exit } - if(test -f /n/kfs/dist/replica/didplan9){ + if(test -f /n/newfs/dist/replica/didplan9){ copydist=done export copydist exit @@ -18,13 +18,13 @@ case go inst/watchfd applylog 0 `{ls -l /n/dist/dist/replica/plan9.log | awk '{print $6}'} 'Installing file system' & replica/pull -c /rc/bin/inst/replcfg - if(~ $status '' *conflicts || test -f /n/kfs/dist/replica/didplan9witherrors) - >/n/kfs/dist/replica/didplan9 + if(~ $status '' *conflicts || test -f /n/newfs/dist/replica/didplan9witherrors) + >/n/newfs/dist/replica/didplan9 if not - >/n/kfs/dist/replica/didplan9witherrors + >/n/newfs/dist/replica/didplan9witherrors case checkdone - if(! test -f /n/kfs/dist/replica/didplan9){ + if(! test -f /n/newfs/dist/replica/didplan9){ copydist=notdone export copydist } --- /sys/lib/dist/pc/inst/defs Thu Mar 31 15:49:39 2005 +++ /sys/lib/dist/pc/inst/defs Thu Mar 31 15:49:36 2005 @@ -159,21 +159,4 @@ grep -s $1 /net/ipifc/*/status >[2]/dev/null } -fn kfsname { - echo $1 | sed 's;/;_;g' -} - -# make sure the kfs server for /dev/$1/fs is running. -# we use /srv/kfs.$1 -# - -fn runkfs { - if(! test -f /srv/kfs.$1 || ! mount /srv/kfs.$1 /n/kremvax) { - rm -f /srv/kfs.$1 /srv/kfs.$1.cmd - disk/kfs -n$1 -f /dev/$1/fs - } - disk/kfscmd -n$1 allow -} - -fstype=fossil --- /sys/lib/dist/pc/inst/download Thu Mar 31 15:50:19 2005 +++ /sys/lib/dist/pc/inst/download Thu Mar 31 15:50:15 2005 @@ -30,24 +30,25 @@ # BUG make restartable echo 'Downloading distribution package...' - if(! hget -vo /n/kfs/dist/_plan9.iso.bz2 $installurl/plan9.iso.bz2 |[2] bargraph -w 145,129,445,168 'downloading '^plan9.iso.bz2) - exit - mv /n/kfs/dist/_plan9.iso.bz2 /n/kfs/dist/plan9.iso.bz2 + baropt='-w 145,129,445,168' + if(~ textinst 1) + baropt=-t + if(! hget -vo /n/newfs/dist/_plan9.iso.bz2 $installurl/plan9.iso.bz2 |[2] bargraph $baropt 'downloading '^plan9.iso.bz2) + exit + mv /n/newfs/dist/_plan9.iso.bz2 /n/newfs/dist/plan9.iso.bz2 if(~ $fstype fossil){ echo fsys main sync >>/srv/fscons } - kname=`{kfsname $fs} - disk/kfscmd -n$kname sync echo 'The distribution is downloaded.' - srvmedia=(disk/kfs -f $fs -n $kname) - mountmedia=(mount /srv/kfs.$kname /n/distmedia) + srvmedia=() + mountmedia=(mount /srv/fossil /n/distmedia) distmediadir=/dist - export srvmedia mountmedia distmediadir + export distmediadir mountmedia distmedia case checkdone - if(! test -f /n/kfs/dist/plan9.iso.bz2) { + if(! test -f /n/newfs/dist/plan9.iso.bz2) { download=notdone export download } --- /sys/lib/dist/pc/inst/fmtfossil Thu Mar 31 15:51:02 2005 +++ /sys/lib/dist/pc/inst/fmtfossil Thu Mar 31 15:50:58 2005 @@ -1,7 +1,7 @@ #!/bin/rc # desc: initialize disks for a fossil server -# prereq: +# prereq: configfs switch($1){ case checkready checkdone @@ -72,18 +72,18 @@ # that retire after three days, in addition to the daily dumps at 5am if(~ $fstype fossil+venti){ v='' - snap='-s 60 -a 0500 -t 2880' + snap='fsys main snaptime -s 60 -a 0500 -t 2880' } # otherwise, take the daily dumps but nothing else -- # we can't retire snapshots unless dumps are being archived if not{ v='-V' - snap='-a 0500' + snap='' } echo \ 'fsys main config '^$f^' fsys main open '^$v^' -c '^$m^' -# fsys main snaptime '^$snap^' +'^$snap^' ' | fossil/conf -w $f } --- /sys/lib/dist/pc/inst/fmtventi Thu Mar 31 15:51:49 2005 +++ /sys/lib/dist/pc/inst/fmtventi Thu Mar 31 15:51:45 2005 @@ -1,7 +1,7 @@ #!/bin/rc # desc: initialize disks for a venti server -# prereq: choosefs +# prereq: mountdist switch($1){ case checkready checkdone @@ -10,25 +10,42 @@ export fmtventi exit } - ff=`{ls /dev/sd*/v.arenas* /dev/fs/v.arenas* >[2]/dev/null} + if(! test -e /bin/venti/fmtarenas || ! test -e /bin/venti/fmtisect || ! test -e /bin/venti/fmtindex){ + bind -a /n/dist/386/bin/venti /bin/venti + if(! test -e /bin/venti/fmtarenas || ! test -e /bin/venti/fmtisect || ! test -e /bin/venti/fmtindex){ + fmtventi=notdone + export fmtventi + exit + } + } + ff=`{ls /dev/sd*/arenas* /dev/fs/arenas* >[2]/dev/null} + if(~ $#ff 0){ + fmtventi=notdone + export fmtventi + exit + } gg=() for(f in $ff) if(isventi $f) gg=($gg $f) if(~ $#gg 0){ - fmtventi=notdone + fmtventi=ready export fmtventi exit } + + ventiarena=$gg(1) + export ventiarena + fmtventi=done export fmtventi exit case go - ff=`{ls /dev/sd*/v.arenas* /dev/fs/v.arenas* >[2]/dev/null} + ff=`{ls /dev/sd*/arenas* /dev/fs/arenas* >[2]/dev/null} if(~ $#ff 0){ echo 'You need to create a partition or partitions to hold the Venti arenas.' - echo 'The arena partition names must begin with "v.arenas".' + echo 'The arena partition names must begin with "arenas".' echo fmtventi=notdone export fmtventi @@ -56,10 +73,10 @@ ventiarena=$aa export ventiarena - gg=`{ls /dev/sd*/v.index* /dev/fs/v.index* >[2]/dev/null} + gg=`{ls /dev/sd*/isect* /dev/fs/isect* >[2]/dev/null} if(~ $#gg 0){ echo 'You need to create a partition or partitions to hold the Venti indices.' - echo 'The index partition names must begin with "v.index".' + echo 'The index partition names must begin with "isect".' echo fmtventi=notdone export fmtventi @@ -123,7 +140,7 @@ for(a in $fmta $fmti){ d=`{echo $a | sed 's!.*:(/.*/).*!\1!'} if(! ~ $d $dd) - $dd=($dd $d) + dd=($dd $d) } for(d in $dd){ { @@ -139,7 +156,7 @@ i=`{echo $a | sed 's!(.*):(/.*/)(.*)!\1 \2 \2\3!'} if(~ $i(2) $d){ echo $i(3) ... - venti/isect $i(1) $i(3) || echo bad >/tmp/fmt + venti/fmtisect $i(1) $i(3) || echo bad >/tmp/fmt echo done with $i(3) } } @@ -162,11 +179,11 @@ for(i in $ventiindex) echo isect $i for(a in $ventiarena) - echo arenas $i + echo arenas $a } | venti/conf -w $v echo Initializing index... - venti/fmtindex -c $v + venti/fmtindex $v echo Done with Venti! } --- /sys/lib/dist/pc/inst/isventi Thu Mar 31 15:52:39 2005 +++ /sys/lib/dist/pc/inst/isventi Thu Mar 31 15:52:36 2005 @@ -1,12 +1,12 @@ #!/bin/rc if(! ~ $#* 1){ - echo 'usage: isfossil /dev/sdC0/part' >[1=2] + echo 'usage: isventi /dev/sdC0/part' >[1=2] exit usage } arg=$1 -if(! cmp -s <{dd -quiet 1 -if $arg -bs 1024 -iseek 127 | +if(! cmp -s <{dd -quiet 1 -if $arg -bs 1024 -iseek 248 | dd -quiet 1 -bs 13 -count 1} <{echo 'venti config'}) exit noconfig exit 0 --- /sys/lib/dist/pc/inst/isventiarenas Thu Mar 31 15:53:33 2005 +++ /sys/lib/dist/pc/inst/isventiarenas Thu Mar 31 15:53:30 2005 @@ -6,7 +6,7 @@ } arg=$1 -if(! cmp -s <{dd -quiet 1 -if $arg -bs 1024 -iseek 128 | +if(! cmp -s <{dd -quiet 1 -if $arg -bs 1024 -iseek 256 | dd -quiet 1 -bs 4 -count 1 | xd -b | sed 1q} <{echo '0000000 a9 e4 a5 e7'}) exit notarenas exit 0 --- /sys/lib/dist/pc/inst/isventiisect Thu Mar 31 15:54:31 2005 +++ /sys/lib/dist/pc/inst/isventiisect Thu Mar 31 15:54:27 2005 @@ -6,7 +6,7 @@ } arg=$1 -if(! cmp -s <{dd -quiet 1 -if $arg -bs 1024 -iseek 128 | +if(! cmp -s <{dd -quiet 1 -if $arg -bs 1024 -iseek 256 | dd -quiet 1 -bs 4 -count 1 | xd -b | sed 1q} <{echo '0000000 d1 5c 5e c7'}) exit notisect exit 0 --- /sys/lib/dist/pc/inst/main Thu Mar 31 15:55:32 2005 +++ /sys/lib/dist/pc/inst/main Thu Mar 31 15:55:28 2005 @@ -12,13 +12,14 @@ # must be topologically sorted (by prereq) tasks=(\ + configfs\ partdisk prepdisk\ - fmtventi\ fmtfossil\ mountfs\ configdist\ confignet\ mountdist\ + fmtventi\ download\ copydist\ bootsetup finish stop\ --- /sys/lib/dist/pc/inst/mountdist Thu Mar 31 15:56:37 2005 +++ /sys/lib/dist/pc/inst/mountdist Thu Mar 31 15:56:33 2005 @@ -36,11 +36,11 @@ fn trycdimagebz2 { if(test -f $1){ - echo -n 'bunzip2 < '^$1^' >/n/kfs/dist/plan9.iso' - bunzip2 < $1 >/n/kfs/dist/_plan9.iso && - mv /n/kfs/dist/_plan9.iso /n/kfs/dist/plan9.iso + echo -n 'bunzip2 < '^$1^' >/n/newfs/dist/plan9.iso' + bunzip2 < $1 >/n/newfs/dist/_plan9.iso && + mv /n/newfs/dist/_plan9.iso /n/newfs/dist/plan9.iso echo - trycdimage /n/kfs/dist/plan9.iso + trycdimage /n/newfs/dist/plan9.iso mountdist=notdone export mountdist exit notdone @@ -74,9 +74,10 @@ case go kfs=() - ext2=() fat=() + ext2=() x9660=() + fossil=() echo Please wait... Scanning storage devices... @@ -84,16 +85,18 @@ for (i in $parts) { echo -n ' '^$i n=`{echo $i | sed 's;/;_;g'} - if(! test -f /tmp/localpart.$n) - dd -if $i -bs 2048 -count 32 -of /tmp/localpart.$n >[2]/dev/null - if(iskfs /tmp/localpart.$n) + #if(! test -f /tmp/localpart.$n) + # dd -if $i -bs 2048 -count 32 -of /tmp/localpart.$n >[2]/dev/null + if(iskfs $i) kfs=($kfs $i) - if(isfat /tmp/localpart.$n) + if(isfat $i) fat=($fat $i) - # if(isext2 /tmp/localpart.$n) + # if(isext2 $i) # ext2=($ext2 $i) - if(is9660 /tmp/localpart.$n) + if(is9660 $i) x9660=($x9660 $i) + if(isfossil $i) + fossil=($fossil $i) echo } echo @@ -104,39 +107,48 @@ switch($i){ case $kfs echo ' '^$i^' (plan9 kfs)' - # case $ext2 - # echo ' '^$i^' (linux ext2)' case $fat - echo ' '^$i^' (microsoft fat)' + echo ' '^$i^' (microsoft fat)' + # case $ext2 + # echo ' '^$i^' (linux ext2)' case $x9660 - echo ' '^$i^' (iso9660 cdrom)' + echo ' '^$i^' (iso9660 cdrom)' + case $fossil + echo ' '^$i^' (plan9 fossil)' } } echo mountstatus=x while(! ~ $mountstatus ''){ - prompt -w '' 'Distribution disk' $kfs $fat $x9660 #$ext2 + prompt -w '' 'Distribution disk' $fat $x9660 $fossil disk=$rd srvmedia=() mountmedia=() switch($disk){ case $fs - mountmedia=(bind /n/kfs /n/distmedia) + mountmedia=(bind /n/newfs /n/distmedia) case $kfs kname=`{kfsname $disk} srvmedia=(disk/kfs -f $disk -n $kname) mountmedia=(mount /srv/kfs.$kname /n/distmedia) - # case $ext2 - # srvmedia=(ext2srv -r) - # mountmedia=(mount /srv/ext2 /n/distmedia $disk) case $fat srvmedia=(dossrv) mountmedia=(mount /srv/dos /n/distmedia $disk) + # case $ext2 + # srvmedia=(ext2srv -r) + # mountmedia=(mount /srv/ext2 /n/distmedia $disk) case $x9660 srvmedia=(9660srv) mountmedia=(mount /srv/9660 /n/distmedia $disk) + case $fossil + echo 'srv fossil.mountdist' > /tmp/fossi.conf + echo 'fsys main config '^$disk >> /tmp/fossil.conf + echo 'fsys main open -AWVP' >> /tmp/fossil.conf + echo 'fsys main' >> /tmp/fossil.conf + srvmedia=(fossil/fossil -c '. /tmp/fossil.conf') + mountmedia=(mount /srv/fossil.mountdist /n/distmedia) case * echo Unknown disk type '(cannot happen)' exit oops @@ -185,6 +197,7 @@ if(! havedist /n/distmedia/$dir) echo 'No distribution found in '^`{cleanname /$dir} } + distmediadir=$dir export distmediadir @@ -194,7 +207,7 @@ export mountdist exit notdone } - if(! havedist /n/distmedia/$distmediadir && ! havedist /n/kfs/dist){ + if(! havedist /n/distmedia/$distmediadir && ! havedist /n/newfs/dist){ mountdist=notdone export mountdist exit notdone @@ -204,6 +217,8 @@ if(test -f /n/distmedia/$distmediadir/dist/replica/plan9.db){ bind /n/distmedia/$distmediadir /n/dist + bind -a /n/dist/386/bin /bin + bind -a /n/dist/rc/bin /bin exitifdone mountdist=notdone export mountdist @@ -211,10 +226,10 @@ } trycdimage /n/distmedia/$distmediadir/plan9.iso - trycdimage /n/kfs/dist/plan9.iso + trycdimage /n/newfs/dist/plan9.iso trycdimagebz2 /n/distmedia/$distmediadir/plan9.iso.bz2 - trycdimagebz2 /n/kfs/dist/plan9.iso.bz2 + trycdimagebz2 /n/newfs/dist/plan9.iso.bz2 mountdist=notdone export mountdist --- /sys/lib/dist/pc/inst/mountfossil Thu Mar 31 15:57:46 2005 +++ /sys/lib/dist/pc/inst/mountfossil Thu Mar 31 15:57:42 2005 @@ -2,11 +2,6 @@ switch($1){ case checkready checkdone - if(~ $fstype fossil+venti && ! ~ $fmtventi done){ - mountfs=notdone - export mountfs - exit - } if(! ~ $fmtfossil done){ mountfs=notdone export mountfs @@ -17,31 +12,16 @@ export mountfs exit } - if(~ $fstype fossil+venti) - if(! ~ $#venti 1 || ! test -f $venti){ - mountfs=ready - export mountfs - exit - } if(! ~ $#fossil 1 || ! test -f $fossil){ mountfs=ready export mountfs exit } - if(~ $fstype fossil+venti && ! ps | grep -s ' venti$'){ - if(! logprog venti/venti -a tcp!127.1!17034 -c $venti >>[2]/srv/log){ - echo 'venti: '^$status - mountfs=ready - export mountfs - exit oops - } - if(ps |grep -s ' fossil$'){ - # reconnect to venti - echo fsys main venti 127.0.0.1 >>/srv/fscons - } - } if(! ps | grep -s ' fossil$'){ - {echo 'srv -p fscons'; echo 'srv -AP fossil'; fossil/conf $fossil | sed 's/^fsys main open .*/& -AWP/'}>/env/fossilconf + echo 'srv -p fscons' > /env/fossilconf + echo 'srv -AP fossil' >> /env/fossilconf + fossil/conf $fossil | sed 's/^fsys main open .*/& -AWVP/' | + sed 's/^fsys main snaptime .*//' >> /env/fossilconf if(! logprog fossil/fossil -c .' /env/fossilconf'>>[2]/srv/log){ echo 'fossil: '^$status mountfs=ready @@ -54,7 +34,7 @@ exit oops } cat /srv/fscons >>/srv/log & - if(! logprog mount -c /srv/fossil /n/fossil){ + if(! logprog mount -c /srv/fossil /n/newfs){ echo 'mount: '^$status mountfs=ready export mountfs @@ -63,37 +43,35 @@ fs=$fossil export fs } - if(! test -s /n/fossil/adm/users){ + if(! test -s /n/newfs/adm/users){ echo fsys main create /active/adm adm sys d775 >>/srv/fscons echo fsys main create /active/adm/users adm sys 664 >>/srv/fscons echo uname upas :upas >>/srv/fscons echo users -w >>/srv/fscons sleep 2 } - if(! test -s /n/fossil/adm/users){ + if(! test -s /n/newfs/adm/users){ echo 'could not create /adm/users' mountfs=ready export mountfs exit oops } for(i in dist dist/replica dist/replica/client){ - if(! test -d /n/fossil/$i) + if(! test -d /n/newfs/$i) echo fsys main create /active/$i sys sys d775 >>/srv/fscons sleep 2 } - if(! test -d /n/fossil/dist/replica/client){ + if(! test -d /n/newfs/dist/replica/client){ echo 'could not create /dist/replica/client' mountfs=ready export mountfs exit oops } - if(! test -e /n/fossil/dist/replica/client/plan9.db){ + if(! test -e /n/newfs/dist/replica/client/plan9.db){ echo fsys main create /active/dist/replica/client/plan9.db sys sys 664 >>/srv/fscons echo fsys main create /active/dist/replica/client/plan9.log sys sys a664 >>/srv/fscons } - if(test -d /n/fossil/dist/replica/client && test -f /n/fossil/adm/users){ - # the rest of the install assumes /n/kfs - bind -c /n/fossil /n/kfs + if(test -d /n/newfs/dist/replica/client && test -f /n/newfs/adm/users){ mountfs=done export mountfs exit @@ -103,28 +81,6 @@ exit case go - if(~ $fstype fossil+venti){ - echo 'The following formatted Venti arenas were found.' - echo - echo 'Please choose one to use as the Venti server.' - echo - files=(`{ls /dev/sd*/v.arenas* /dev/fs/v.arenas* >[2]/dev/null}) - ls -l $files - echo - if(~ $#venti 1 && ~ $venti $files) - default=(-d $venti) - if not if(~ $#files 1) - default=(-d $files) - if not - default=() - prompt $default 'Venti arena w/ config file' $files - if(! ~ $#venti 1 || ! ~ $venti $rd){ - slay venti|rc - venti=$rd - export venti - } - } - echo 'The following partitions named fossil* were found.' echo echo 'Please choose one to use as the installation file system' --- /sys/lib/dist/pc/inst/mountfs Thu Mar 31 15:58:58 2005 +++ /sys/lib/dist/pc/inst/mountfs Thu Mar 31 15:58:55 2005 @@ -1,7 +1,7 @@ #!/bin/rc # desc: choose and mount file system partition -# prereq: +# prereq: configfs switch($fstype){ case fossil fossil+venti --- /sys/lib/dist/pc/inst/partdisk Thu Mar 31 16:00:15 2005 +++ /sys/lib/dist/pc/inst/partdisk Thu Mar 31 16:00:12 2005 @@ -1,7 +1,7 @@ #!/bin/rc # desc: edit partition tables (e.g., to create a plan 9 partition) -# prereq: +# prereq: configfs switch($1){ case go --- /sys/lib/dist/pc/inst/replcfg Thu Mar 31 16:01:37 2005 +++ /sys/lib/dist/pc/inst/replcfg Thu Mar 31 16:01:33 2005 @@ -8,8 +8,8 @@ fn serverupdate { status='' } fn clientmount { status='' } -c=/n/kfs/dist/replica -clientroot=/n/kfs +c=/n/newfs/dist/replica +clientroot=/n/newfs clientproto=$c/plan9.proto clientdb=$c/client/plan9.db clientexclude=(dist/replica/client) --- /sys/lib/dist/pc/inst/textonly Thu Mar 31 16:03:01 2005 +++ /sys/lib/dist/pc/inst/textonly Thu Mar 31 16:02:58 2005 @@ -4,6 +4,9 @@ cd /bin/inst . defs +textinst=1 +export textinst + tailfsrv & while(! test -f /srv/log) sleep 1 --- /sys/lib/dist/pc/inst/watchfd Thu Mar 31 16:04:31 2005 +++ /sys/lib/dist/pc/inst/watchfd Thu Mar 31 16:04:27 2005 @@ -7,7 +7,11 @@ } p=$p(1) +baropt='-w 145,129,445,168' +if(~ textinst 1) + baropt=-t + { while(test -f /proc/$p/fd) grep '^ *'^$2^' ' /proc/$p/fd >[2]/dev/null -} | awk '{print $9 " '^$3^'"; fflush("/dev/stdout")}' | bargraph -w 145,129,445,168 $4 +} | awk '{print $9 " '^$3^'"; fflush("/dev/stdout")}' | bargraph $baropt $4 --- /sys/src/9/pc/pcflop Thu Mar 31 16:06:02 2005 +++ /sys/src/9/pc/pcflop Thu Mar 31 16:05:59 2005 @@ -58,6 +58,7 @@ ethermedium pcmciamodem netdevmedium + loopbackmedium # usbuhci misc @@ -82,9 +83,11 @@ vgai81x +cur vgamach64xx +cur vgamga2164w +cur + vgaradeon +cur vgamga4xx +cur vganeomagic +cur vganvidia +cur +# vgaradeon +cur vgargb524 =cur vgas3 +cur vgasavage vgat2r4 +cur