diff options
| author | cinap_lenrek <cinap_lenrek@localhost> | 2011-04-22 01:39:00 +0000 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@localhost> | 2011-04-22 01:39:00 +0000 |
| commit | f246b097baec9ba853953073de3b47cdbe788063 (patch) | |
| tree | fb9477afb5a59acd26c1b022497c18fcc18664fd | |
| parent | 40dab914b7b92e75dd6297ab31c86bea033e8fa9 (diff) | |
| download | plan9front-f246b097baec9ba853953073de3b47cdbe788063.tar.xz | |
inst: default dist location to /, use old cache format by default... will change back when cwfs can autodetect it
| -rw-r--r-- | rc/bin/inst/mountcwfs | 7 | ||||
| -rwxr-xr-x | rc/bin/inst/mountdist | 22 |
2 files changed, 6 insertions, 23 deletions
diff --git a/rc/bin/inst/mountcwfs b/rc/bin/inst/mountcwfs index 615a01253..40142e8fc 100644 --- a/rc/bin/inst/mountcwfs +++ b/rc/bin/inst/mountcwfs @@ -64,16 +64,17 @@ case go unmount /n/newfs >[2]/dev/null echo halt >>/srv/cwfs.cmd >[2]/dev/null rm -f /srv/cwfs /srv/cwfs.cmd - if(! $fstype -c -C -f $fs </tmp/fsconfig){ + if(! $fstype -c -f $fs </tmp/fsconfig){ mountfs=ready export mountfs exit oops } + log Configuering $fstype file server for $fs { echo allow echo users default - echo filsys main + echo cfs main echo create /adm adm adm 775 d echo create /adm/users adm adm 664 echo create /usr sys sys 775 d @@ -94,7 +95,7 @@ case go case checkready checkdone if(! ~ $fstype '' && ~ $#fs 1 && test -f $fs){ if(! test -f /srv/cwfs){ - logprog $fstype -C -f $fs + logprog $fstype -f $fs echo allow >>/srv/cwfs.cmd >>[2]/srv/log } if(test -f /srv/cwfs && ! test -f /n/newfs/adm/users){ diff --git a/rc/bin/inst/mountdist b/rc/bin/inst/mountdist index 26ef487f4..e90f4799f 100755 --- a/rc/bin/inst/mountdist +++ b/rc/bin/inst/mountdist @@ -111,32 +111,14 @@ case go echo Which directory contains the distribution? echo 'Any of the following will suffice (in order of preference):' echo ' - the root directory of the cd image' - echo ' - the directory containing plan9.iso' - echo ' - the directory containing plan9.iso.bz2' - echo 'Typing `browse'' will put you in a shell that you can use to' - echo 'look for the directory.' echo first=no } - prompt -d browse 'Location of archives' + prompt -d $dir 'Location of archives' dir=$rd - if(~ $dir browse){ - echo This is a simple shell. Commands are: - echo ' cd directory - change to directory' - echo ' lc - list contents of current directory' - echo ' exit - exit shell' - echo - echo 'Move to the directory containing the distribution' - echo 'and then exit.' - echo - oifs=$ifs - ifs=$nl - dir=`{cdsh -r /n/distmedia} - ifs=$oifs - } if(~ $#dir 0) - dir=safdsfdsfdsf + dir=/ if(! ~ $#dir 1) dir=$"dir if(! havedist /n/distmedia/$dir) |