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
14981498 snprint (location, sizeof (location),
14991499 "%s/%s", path, tmpDr->name);
15001500
1501− if (vflag) print ("checking for remote location[%s]\n",location);
1502− if (DMDIR & tmpDr->mode) {
1503− tmp = validaterr (location, os, arch);
1504− if (tmp != nil) {
1505− allremotenodes[tmprc] = tmp;
1506− ++tmprc;
1501+ /* entry should be directory and should not be "local" */
1502+ if ( (DMDIR & tmpDr->mode) && (strcmp (tmpDr->name, VALIDATEDIR) != 0) ) {
1503+ if (vflag) print ("checking for remote location[%s]\n",location);
1504+ tmp = validaterr (location, os, arch);
1505+ if (tmp != nil) {
1506+ allremotenodes[tmprc] = tmp;
1507+ ++tmprc;
15071508 if (vflag) print ("Resource [%s]\n", tmp->path);
15081509 }
15091510 }
usr/inferno/appl/cmd/scripts/anl/linux/deploy/deployBrasil.sh+9−1
@@ -33,13 +33,16 @@ EXAMPLES · 32 unmodified lines
3333 pflag=$BRASIL_PORT
3434 lflag=$HARE_LOCATION
3535
36−while getopts 'fp:l:' OPTION
36+while getopts 'fbp:l:' OPTION
3737 do
3838 case $OPTION in
3939 p) pflag="$OPTARG"
4040 ;;
4141 l) lflag="$OPTARG"
4242 ;;
43+ b) echo "Running without any arguments"
44+ bflag="true"
45+ ;;
4346 f) echo "Running in forground"
4447 fflag="true"
4548 ;;
@@ -80,6 +83,11 @@ fi · 34 unmodified lines
8083 # Launch the brasil
8184 arg=`echo "'"tcp!*!$pflag"'"`
8285
86+
87+if [ ! -z $bflag ]
88+then
89+ $brasil_exec
90+fi
8391 if [ -z $fflag ]
8492 then
8593 $brasil_exec server -h $arg < /dev/null > /dev/null &