diff options
| -rwxr-xr-x | lib/namespace | 1 | ||||
| -rwxr-xr-x | rc/bin/inst/copydist | 4 | ||||
| -rw-r--r-- | rc/bin/inst/mountcwfs | 21 | ||||
| -rwxr-xr-x | rc/bin/inst/mountdist | 6 | ||||
| -rw-r--r-- | sys/lib/dist/mkfile | 2 | ||||
| -rwxr-xr-x | sys/lib/rootstub | 1 | ||||
| -rw-r--r-- | sys/lib/sysconfig/proto/cdproto | 7 | ||||
| -rw-r--r-- | usr/glenda/lib/profile | 5 |
8 files changed, 26 insertions, 21 deletions
diff --git a/lib/namespace b/lib/namespace index 42f693623..87f30eb4f 100755 --- a/lib/namespace +++ b/lib/namespace @@ -32,6 +32,7 @@ mount -a /srv/net /net mount -qC /srv/cwfs /n/other other bind -qc /n/other/usr/$user/tmp /usr/$user/tmp +bind -qc /n/other/dist /dist bind -c /usr/$user/tmp /tmp cd /usr/$user 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 diff --git a/sys/lib/dist/mkfile b/sys/lib/dist/mkfile index 0251c4866..b895f731a 100644 --- a/sys/lib/dist/mkfile +++ b/sys/lib/dist/mkfile @@ -2,6 +2,8 @@ cd:V: /tmp/9front.iso %.iso: pc/plan9.ini.cd + bind /n/src9 /n/src9/dist/plan9front bind pc/plan9.ini.cd /n/src9/cfg/plan9.ini disk/mk9660 -9cj -B 386/9bootiso -p /n/src9/sys/lib/sysconfig/proto/cdproto -s /n/src9 -v 'Plan 9 Front' $target unmount /n/src9/cfg/plan9.ini + unmount /n/src9/dist/plan9front diff --git a/sys/lib/rootstub b/sys/lib/rootstub index 3b1da4b69..921783c17 100755 --- a/sys/lib/rootstub +++ b/sys/lib/rootstub @@ -107,6 +107,7 @@ mkdir -p arm/bin/upas mkdir -p arm/bin/usb mkdir -p arm/bin/venti mkdir -p arm/lib/ape +mkdir -p dist/plan9front mkdir -p fd mkdir -p lib/audio mkdir -p mail/faxoutqueue diff --git a/sys/lib/sysconfig/proto/cdproto b/sys/lib/sysconfig/proto/cdproto index c45984a97..f739fd470 100644 --- a/sys/lib/sysconfig/proto/cdproto +++ b/sys/lib/sysconfig/proto/cdproto @@ -1,4 +1,3 @@ -skip=.dummy uid=sys gid=sys adm d775 adm adm @@ -123,6 +122,12 @@ usr d775 * tmp d775 +dist d775 + plan9front d775 + .hgignore 555 + .hg d775 + + + LICENSE 444 LICENSE.afpl 444 LICENSE.gpl 444 diff --git a/usr/glenda/lib/profile b/usr/glenda/lib/profile index 79aebb7e0..86c54a22c 100644 --- a/usr/glenda/lib/profile +++ b/usr/glenda/lib/profile @@ -1,6 +1,7 @@ bind -a $home/bin/rc /bin bind -a $home/bin/$cputype /bin mount -qC /srv/cwfs /n/other other +bind -qc /n/other/dist /dist bind -qc /n/other/usr/$user/tmp $home/tmp bind -c $home/tmp /tmp if(! syscall create /tmp/xxx 1 0666 >[2]/dev/null) @@ -16,7 +17,7 @@ case terminal echo -n 'res 3' > '#m/mousectl' prompt=('term% ' ' ') fn term%{ $* } - exec rio -i riostart + exec rio -s -i riostart case cpu if (test -e /mnt/term/mnt/wsys) { # rio already running bind -a /mnt/term/mnt/wsys /dev @@ -30,7 +31,7 @@ case cpu fn cpu%{ $* } if (! test -e /mnt/term/mnt/wsys) { # cpu call from drawterm font=/lib/font/bit/pelm/latin1.8.font - exec rio + exec rio -s } case con prompt=('cpu% ' ' ') |