This patch comments kfs out and inserts ext2 instead. Suggested files to be removed: moveoldfs, mountkfs, iskfs Discussion about mountdist: # if(! test -f /tmp/localpart.$n) # dd -if $i -bs 2048 -count 32 -of /tmp/localpart.$n >[2]/dev/null These lines need to be commented out, because isfossil has to read further than 2048x32 Bytes for checking if it is fossil. Discussion about the common installation: There were thoughts about mounting kfs from /boot, but as I see this is bzfs. Can bzfs mount normal kfs partitons? Notes: Sat Apr 2 12:00:47 EST 2005 rsc Please pull from sources and reapply your changes and then resubmit the patch. Your patch puts back some things I changed yesterday, in particular the large comment at the top of the file. It also undoes the caching that I put in yesterday. Thanks. Reference: /n/sources/patch/sorry/install-ext2fs-added Date: Sat Apr 2 15:15:30 CES 2005 Reviewed-by: rsc --- /sys/lib/dist/pc/inst/mountdist Sat Apr 2 15:14:56 2005 +++ /sys/lib/dist/pc/inst/mountdist Sat Apr 2 15:14:52 2005 @@ -1,5 +1,11 @@ #!/bin/rc +# We don't support ext2 because I'm not motivated enough +# to convert ext2srv, a server that only half works to begin with, +# to 9P2000. If someone else wants to update ext2srv, I'll be happy +# to put back support for installing from ext2 partitions back. +# - rsc + # prereq: mountfs configdist # desc: locate and mount the distribution @@ -67,7 +73,7 @@ } case go - kfs=() +# kfs=() fat=() ext2=() x9660=() @@ -79,17 +85,17 @@ 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) - kfs=($kfs $i) - if(isfat /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 $i) fat=($fat $i) - # if(isext2 /tmp/localpart.$n) - # ext2=($ext2 $i) - if(is9660 /tmp/localpart.$n) + if(isext2 $i) + ext2=($ext2 $i) + if(is9660 $i) x9660=($x9660 $i) - if(isfossil /tmp/localpart.$n) + if(isfossil $i) fossil=($fossil $i) echo } @@ -99,8 +105,8 @@ echo for(i in $parts){ switch($i){ - case $kfs - echo ' '^$i^' (plan9 kfs)' +# case $kfs +# echo ' '^$i^' (plan9 kfs)' case $fat echo ' '^$i^' (microsoft fat)' case $ext2 @@ -123,10 +129,10 @@ switch($disk){ case $fs 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 $kfs +# kname=`{kfsname $disk} +# srvmedia=(disk/kfs -f $disk -n $kname) +# mountmedia=(mount /srv/kfs.$kname /n/distmedia) case $fat srvmedia=(dossrv) mountmedia=(mount /srv/dos /n/distmedia $disk) --- /sys/lib/dist/pc/proto Sat Apr 2 15:15:14 2005 +++ /sys/lib/dist/pc/proto Sat Apr 2 15:15:10 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 @@ -73,7 +73,7 @@ ed 555 sys sys # if cpu goes, exportfs could go # exportfs 555 sys sys -# ext2srv 555 sys sys + ext2srv 555 sys sys fcp 555 sys sys grep 555 sys sys hget 555 sys sys