History

fixed the way remote resources are searched. Checking only those directories which are not named "local" This way, ctl file is ignored and "local" dir is ignored as it is not remote resource.

shindepravin committed 16 years ago

Commit 113d87d1 parent 96041aa2 files · +16 −7Browse files

Unified · Split

2 files
  1. usr/brasil/emu/port/devtask.c +7 −6
  2. usr/inferno/appl/cmd/scripts/anl/linux/deploy/deployBrasil.sh +9 −1
usr/brasil/emu/port/devtask.c+7−6
@@ -1498,12 +1498,13 @@ findrr (int *validrc, char *os, char *arch) · 1497 unmodified lines
1498 snprint (location, sizeof (location), 1498 snprint (location, sizeof (location),
1499 "%s/%s", path, tmpDr->name);1499 "%s/%s", path, tmpDr->name);
1500 1500
1501 if (vflag) print ("checking for remote location[%s]\n",location);1501 /* entry should be directory and should not be "local" */
1502 if (DMDIR & tmpDr->mode) { 1502 if ( (DMDIR & tmpDr->mode) && (strcmp (tmpDr->name, VALIDATEDIR) != 0) ) {
1503 tmp = validaterr (location, os, arch);1503 if (vflag) print ("checking for remote location[%s]\n",location);
1504 if (tmp != nil) {1504 tmp = validaterr (location, os, arch);
1505 allremotenodes[tmprc] = tmp;1505 if (tmp != nil) {
1506 ++tmprc;1506 allremotenodes[tmprc] = tmp;
1507 ++tmprc;
1507 if (vflag) print ("Resource [%s]\n", tmp->path);1508 if (vflag) print ("Resource [%s]\n", tmp->path);
1508 } 1509 }
1509 }1510 }
usr/inferno/appl/cmd/scripts/anl/linux/deploy/deployBrasil.sh+9−1
@@ -33,13 +33,16 @@ EXAMPLES · 32 unmodified lines
33pflag=$BRASIL_PORT33pflag=$BRASIL_PORT
34lflag=$HARE_LOCATION34lflag=$HARE_LOCATION
35 35
36while getopts 'fp:l:' OPTION36while getopts 'fbp:l:' OPTION
37do37do
38 case $OPTION in38 case $OPTION in
39 p) pflag="$OPTARG"39 p) pflag="$OPTARG"
40 ;;40 ;;
41 l) lflag="$OPTARG"41 l) lflag="$OPTARG"
42 ;;42 ;;
43 b) echo "Running without any arguments"
44 bflag="true"
45 ;;
43 f) echo "Running in forground" 46 f) echo "Running in forground"
44 fflag="true"47 fflag="true"
45 ;;48 ;;
@@ -80,6 +83,11 @@ fi · 34 unmodified lines
80# Launch the brasil83# Launch the brasil
81arg=`echo "'"tcp!*!$pflag"'"`84arg=`echo "'"tcp!*!$pflag"'"`
82 85
86
87if [ ! -z $bflag ]
88then
89 $brasil_exec
90fi
83if [ -z $fflag ]91if [ -z $fflag ]
84then92then
85 $brasil_exec server -h $arg < /dev/null > /dev/null &93 $brasil_exec server -h $arg < /dev/null > /dev/null &