audiohda: fix syntax error

[plan9front.git] / rc / bin / inst / mountdist

diff --git a/rc/bin/inst/mountdist b/rc/bin/inst/mountdist
index 672c25966dc7d1d135f5ea0a7e27ec2be55a6167..f3fb5dde0c7f2c185518c455c73dd5d9e0b32c8c 100755 (executable)
--- a/rc/bin/inst/mountdist
+++ b/rc/bin/inst/mountdist
@@ -22,7 +22,7 @@ fn havedist {
 fn trycdimage{
        if(test -f $1){
                rm -f /srv/9660.dist
-               unmount /n/dist
+               unmount /n/dist >[2]/dev/null
                9660srv 9660.dist >[2]/dev/null
                logprog mount /srv/9660.dist /n/dist $1
                exitifdone
@@ -34,6 +34,7 @@ fn trycdimage{
 
 fn trycdimagebz2 {
        if(test -f $1){
+               mkdir -p /n/newfs/dist
                echo -n 'bunzip2 < '^$1^' >/n/newfs/dist/9front.iso'
                bunzip2 < $1 >/n/newfs/dist/_9front.iso &&
                mv /n/newfs/dist/_9front.iso /n/newfs/dist/9front.iso
@@ -56,7 +57,7 @@ case checkready
                if(domount){
                        mountdist=done
                        export mountdist
-                       if(mountdist checkdone)
+                       if(./mountdist checkdone)
                                exit
                }
                srvmedia=()
@@ -71,7 +72,8 @@ case go
 
        echo Please wait... Scanning storage devices...
 
-       parts=`{ls /dev/sd*/* >[2]/dev/null | grep -v '/(plan9.*|nvram|ctl|log|raw)$'}
+       parts=`{ls /dev/sd*/* /srv/sd*/*.iso >[2]/dev/null |
+               grep -v '/(plan9.*|nvram|ctl|log|raw)$'}
        for (i in $parts) {
                echo -n '       '^$i
                t=`{fstype $i}
@@ -100,14 +102,16 @@ case go
        mountstatus=x
        while(! ~ $mountstatus ''){
                default=()
-               if(! ~ $#cdboot 0 && ! ~ $#x9660 0)
-                       default=(-d $x9660(1))
-               prompt $default 'Distribution disk' $fat $x9660 $fs
+               if(! ~ $#cdboot 0)
+                       default=(-d /)
+               prompt $default 'Distribution disk' $fat $x9660 $fs /
                disk=$rd
 
                srvmedia=()
                mountmedia=()
                switch($disk){
+               case /
+                       mountmedia=(mount /srv/boot /n/distmedia)
                case $fs
                        mountmedia=(bind /n/newfs /n/distmedia)
                case $fat