diff options
| author | cinap_lenrek <cinap_lenrek@localhost> | 2011-04-22 00:50:41 +0000 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@localhost> | 2011-04-22 00:50:41 +0000 |
| commit | 40dab914b7b92e75dd6297ab31c86bea033e8fa9 (patch) | |
| tree | 98edac34471e8144fb646824b88f5d04daacf3f2 /rc/bin/inst/mountdist | |
| parent | b14bc93a797c909fb3e1bf2681aa8277043c6cf0 (diff) | |
| download | plan9front-40dab914b7b92e75dd6297ab31c86bea033e8fa9.tar.xz | |
inst: installer adaption to cwfs
Diffstat (limited to 'rc/bin/inst/mountdist')
| -rwxr-xr-x | rc/bin/inst/mountdist | 56 |
1 files changed, 4 insertions, 52 deletions
diff --git a/rc/bin/inst/mountdist b/rc/bin/inst/mountdist index 8d171a1cc..26ef487f4 100755 --- a/rc/bin/inst/mountdist +++ b/rc/bin/inst/mountdist @@ -11,40 +11,12 @@ fn domount{ } fn exitifdone{ - if(test -f /n/dist/dist/replica/plan9.db) + if(test -f /n/dist/LICENSE) exit } -fn trycdimage{ - if(test -f $1){ - rm -f /srv/9660.dist - unmount /n/dist - 9660srv 9660.dist >[2]/dev/null - logprog mount /srv/9660.dist /n/dist $1 - exitifdone - mountdist=notdone - export mountdist - exit notdone - } -} - -fn trycdimagebz2 { - if(test -f $1){ - echo -n 'bunzip2 < '^$1^' >/n/newfs/dist/plan9.iso' - bunzip2 < $1 >/n/newfs/dist/_plan9.iso && - mv /n/newfs/dist/_plan9.iso /n/newfs/dist/plan9.iso - echo - trycdimage /n/newfs/dist/plan9.iso - mountdist=notdone - export mountdist - exit notdone - } -} - fn havedist { - test -f $1/dist/replica/plan9.db || - test -f $1/plan9.iso || - test -f $1/plan9.iso.bz2 + test -f $1/LICENSE } switch($1){ @@ -70,7 +42,6 @@ case go fat=() ext2=() x9660=() - fossil=() echo Please wait... Scanning storage devices... @@ -86,8 +57,6 @@ case go ext2=($ext2 $i) if(is9660 /tmp/localpart.$n) x9660=($x9660 $i) - if(isfossil $i) - fossil=($fossil $i) echo } echo @@ -102,15 +71,13 @@ case go echo ' '^$i^' (linux ext2)' case $x9660 echo ' '^$i^' (iso9660 cdrom)' - case $fossil - echo ' '^$i^' (plan9 fossil)' } } echo mountstatus=x while(! ~ $mountstatus ''){ - prompt -w '' 'Distribution disk' $fat $x9660 $fossil + prompt -w '' 'Distribution disk' $fat $x9660 disk=$rd srvmedia=() @@ -127,13 +94,6 @@ case go case $x9660 srvmedia=(9660srv) mountmedia=(mount /srv/9660 /n/distmedia $disk) - case $fossil - echo 'srv fossil.mountdist' > /tmp/fossi.conf - echo 'fsys main config '^$disk >> /tmp/fossil.conf - echo 'fsys main open -AWVP' >> /tmp/fossil.conf - echo 'fsys main' >> /tmp/fossil.conf - srvmedia=(fossil/fossil -c '. /tmp/fossil.conf') - mountmedia=(mount /srv/fossil.mountdist /n/distmedia) case * echo Unknown disk type '(cannot happen)' exit oops @@ -200,22 +160,14 @@ case checkdone exitifdone - if(test -f /n/distmedia/$distmediadir/dist/replica/plan9.db){ + if(havedist /n/distmedia/$distmediadir){ bind /n/distmedia/$distmediadir /n/dist - bind -a /n/dist/386/bin /bin - bind -a /n/dist/rc/bin /bin exitifdone mountdist=notdone export mountdist exit notdone } - trycdimage /n/distmedia/$distmediadir/plan9.iso - trycdimage /n/newfs/dist/plan9.iso - - trycdimagebz2 /n/distmedia/$distmediadir/plan9.iso.bz2 - trycdimagebz2 /n/newfs/dist/plan9.iso.bz2 - mountdist=notdone export mountdist exit notdone |