diff options
Diffstat (limited to 'rc/bin/inst')
| -rwxr-xr-x | rc/bin/inst/copydist | 4 | ||||
| -rw-r--r-- | rc/bin/inst/mountcwfs | 21 | ||||
| -rwxr-xr-x | rc/bin/inst/mountdist | 6 |
3 files changed, 13 insertions, 18 deletions
diff --git a/rc/bin/inst/copydist b/rc/bin/inst/copydist index 2d89a012b..e6baa26d6 100755 --- a/rc/bin/inst/copydist +++ b/rc/bin/inst/copydist @@ -5,12 +5,12 @@ switch($1){ case checkready - if(! test -f /n/dist/LICENSE){ + if(! test -d /n/dist/dist/plan9front){ copydist=notdone export copydist exit } - if(test -f /n/newfs/LICENSE && test -f /tmp/copydone){ + if(test -d /n/newfs/dist/plan9front && test -f /tmp/copydone){ copydist=done export copydist exit diff --git a/rc/bin/inst/mountcwfs b/rc/bin/inst/mountcwfs index afbe014a3..b906f2e19 100644 --- a/rc/bin/inst/mountcwfs +++ b/rc/bin/inst/mountcwfs @@ -98,6 +98,7 @@ case go echo create /adm adm adm 775 d echo create /adm/users adm adm 664 echo create /usr sys sys 775 d + echo create /dist sys sys 775 d echo newuser $user echo newuser sys +$user echo newuser adm +$user @@ -106,6 +107,7 @@ case go echo create /usr sys sys 775 d echo create /usr/$user $user $user 775 d echo create /usr/$user/tmp $user $user 750 d + echo create /dist sys sys 775 d echo cfs main } } >>/srv/cwfs.cmd @@ -117,22 +119,15 @@ case go export mountfs exit } + if(! ~ $fsother ''){ + log Mounting $fstype file server for $fsother + if(logprog mount -c /srv/cwfs /n/other other) + bind -qc /n/other/dist /n/newfs/dist + } case checkready checkdone if(! ~ $fstype '' && ~ $#fs 1 && test -f $fs){ - if(! test -f /srv/cwfs){ - logprog $fstype -f $fs - echo allow >>/srv/cwfs.cmd >>[2]/srv/log - } - if(test -f /srv/cwfs && ! test -f /n/newfs/adm/users){ - log Mounting $fstype file server for $fs - if(! logprog mount -c /srv/cwfs /n/newfs){ - mountfs=ready - export mountfs - exit - } - } - if(test -f /srv/cwfs && test -f /n/newfs/adm/users){ + if(test -f /srv/cwfs && test -d /n/newfs/dist){ mountfs=done export mountfs exit diff --git a/rc/bin/inst/mountdist b/rc/bin/inst/mountdist index 11a07f979..672c25966 100755 --- a/rc/bin/inst/mountdist +++ b/rc/bin/inst/mountdist @@ -11,12 +11,12 @@ fn domount{ } fn exitifdone{ - if(test -f /n/dist/LICENSE) + if(test -d /n/dist/dist/plan9front) exit } fn havedist { - test -f $1/LICENSE || test -f $1/9front.iso || test -f $1/9front.iso.bz2 + test -d $1/dist/plan9front || test -f $1/9front.iso || test -f $1/9front.iso.bz2 } fn trycdimage{ @@ -166,7 +166,7 @@ case checkdone exitifdone - if(test -f /n/distmedia/$distmediadir/LICENSE){ + if(test -d /n/distmedia/$distmediadir/dist/plan9front){ bind /n/distmedia/$distmediadir /n/dist exitifdone mountdist=notdone |