diff options
| author | irina <irinagomez@us.es> | 2013-10-11 12:40:20 +0000 |
|---|---|---|
| committer | irina <irinagomez@us.es> | 2013-10-11 12:40:20 +0000 |
| commit | f456755884247a72cf1af575a6e15c8c3fc92442 (patch) | |
| tree | 0033af7e543e38c3022f704510858de03d086cab /client/shared/scripts/restoreDiffImage | |
| parent | be48687d995f88aeb4bb482e96e2c870bd82f568 (diff) | |
#565 adaptacion diferenciales al cliente 1.0.4., extension diferenciles img.diff
git-svn-id: https://opengnsys.es/svn/branches/version1.0@4059 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/shared/scripts/restoreDiffImage')
| -rwxr-xr-x | client/shared/scripts/restoreDiffImage | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/client/shared/scripts/restoreDiffImage b/client/shared/scripts/restoreDiffImage index dc7a3762..6d1a66a1 100755 --- a/client/shared/scripts/restoreDiffImage +++ b/client/shared/scripts/restoreDiffImage @@ -69,7 +69,8 @@ PART=$(ogDiskToDev "$3" "$4" 2>/dev/null ) || ogRaiseError $OG_ERR_PARTITION "$ [ -z $OGENGINECONFIGURATE ] && source /opt/opengnsys/etc/engine.cfg # Comprobar que es sincronizable -file $REPODIFFFILE | grep " BTRFS Filesystem" >/dev/null || ogRaiseError $OG_ERR_DONTSYNC_IMAGE "$3 $4" +#file $REPODIFFFILE | grep -i -e " BTRFS Filesystem " -e " ext4 filesystem " >/dev/null || ogRaiseError $OG_ERR_DONTSYNC_IMAGE "$3 $4" +ogIsImageSync $3 "$4" diff || ogRaiseError $OG_ERR_DONTSYNC_IMAGE "$3 $4" PROTO=${5:-"UNICAST"} @@ -120,7 +121,8 @@ ogRestoreInfoImage "$3" "$4" &>$OGLOGCOMMAND # Llamar al script de post-configuración del sistema operativo. echo "[90] $MSG_HELP_configureOs." -configureOs $3 $4 +# el || echo es para evitar que se maneje el error. +configureOs $3 $4 &>>$OGLOGCOMMAND || echo "$?" &>>$OGLOGCOMMAND TIME=$[SECONDS-TIME1] |