diff options
| author | irina <irinagomez@us.es> | 2017-06-23 10:11:44 +0000 |
|---|---|---|
| committer | irina <irinagomez@us.es> | 2017-06-23 10:11:44 +0000 |
| commit | b3a5e026ccf0770154580379e4839550926bb169 (patch) | |
| tree | 9b69bcdff123755ecf33ea7637e65d9845aa1999 | |
| parent | 4be0673ea85bd7547abfebad8788f784cc050667 (diff) | |
#678 ogMcastRequest: Se adaptan a unidades organizativas con directorios separados.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5375 a21b9725-9963-47de-94b9-378ad31fedc9
| -rwxr-xr-x | client/engine/Protocol.lib | 10 | ||||
| -rwxr-xr-x | client/shared/scripts/restoreImage | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/client/engine/Protocol.lib b/client/engine/Protocol.lib index fb4aea61..15f8d910 100755 --- a/client/engine/Protocol.lib +++ b/client/engine/Protocol.lib @@ -774,11 +774,15 @@ fi #@version 1.1 - Control de errores en transferencia multicast (ticket #781) #@author Irina Gomez, ETSII Universidad de Sevilla #@date 2017/04/20 +#@version 1.1 - Unidades organizativas con directorio de imágenes separado. (ticket #678) +#@author Irina Gomez, ETSII Universidad de Sevilla +#@date 2017/06/23 #*/ ## function ogMcastRequest { # Variables locales -local FILE PROTOOPT PORT PORTAUX REPOIP REPOPORTAUX REPEAT -FILE="$1" +local FILE PROTOOPT PORT PORTAUX REPOIP REPOPORTAUX REPEAT OGUNIT +OGUNIT="$(df|awk '/ogimages/ {print $1}'|cut -d/ -f5)/" +FILE="$OGUNIT$1" PROTOOPT="$2" #TODO AYUDA @@ -793,7 +797,7 @@ until nmap -n -sU -p $PORTAUX $REPOIP | grep open do let REPEAT=$REPEAT+1 [ "$REPEAT" -lt 6 ] || ogRaiseError session log $OG_ERR_PROTOCOLJOINMASTER "MULTICAST \"$FILE\" \"$PROTOOPT\" $FILELIST" || return $? - echo "$MSG_SCRIPTS_TASK_START : hose $REPOIP $REPOPORTAUX --out sh -c "echo -ne START_MULTICAST $1 $2"" + echo "$MSG_SCRIPTS_TASK_START : hose $REPOIP $REPOPORTAUX --out sh -c "echo -ne START_MULTICAST $FILE $2"" #update-cache: hose $REPOIP $REPOPORTAUX --out sh -c "echo -ne START_MULTICAST "$FILE" "$PROTOOPT"" #multicas-direct: hose $REPOIP 2009 --out sh -c "echo -ne START_MULTICAST /$IMAGE.img $OPTPROTOCOLO" diff --git a/client/shared/scripts/restoreImage b/client/shared/scripts/restoreImage index fda3921e..00f51f49 100755 --- a/client/shared/scripts/restoreImage +++ b/client/shared/scripts/restoreImage @@ -85,7 +85,7 @@ case "$PROTO" in COMPRESS=$(ogGetImageCompressor REPO $IMGNAME) #TODO comprobar parametros anteriores ogEcho log session "[40] ogMcastReceiverPartition $DISK $PART $PORT $TOOL $COMPRESS" - ogMcastRequest "$OGUNIT$IMGNAME.img" "$PROTOOPT" || exit $? + ogMcastRequest "$IMGNAME.img" "$PROTOOPT" || exit $? ogExecAndLog command ogMcastReceiverPartition "$DISK" "$PART" "$PORT" "$TOOL" "$COMPRESS" RETVAL=$? ;; |