include hg repository in /dist/plan9front and install it

This commit is contained in:
cinap_lenrek 2011-05-03 08:53:59 +00:00
parent 4875561fdb
commit f5685a313d
8 changed files with 26 additions and 21 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

2
sys/lib/dist/mkfile vendored
View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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% ' ' ')