summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authoririna <irinagomez@us.es>2014-08-04 09:30:35 +0000
committeririna <irinagomez@us.es>2014-08-04 09:30:35 +0000
commitedcf62da7f564b213640abd2d1a023a7dc33eb72 (patch)
treef6a151bc570527e1873ad3a8f1a7157f15be058c /client
parentc6130f42552b9954574f3453cad98fde09463725 (diff)
#653 restoreBaseImage y restoreDiffImage: se incluye configureOsCustom -> postconfiguracion personalizada.
git-svn-id: https://opengnsys.es/svn/branches/version1.0@4359 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client')
-rwxr-xr-xclient/shared/scripts/restoreBaseImage5
-rwxr-xr-xclient/shared/scripts/restoreDiffImage10
2 files changed, 12 insertions, 3 deletions
diff --git a/client/shared/scripts/restoreBaseImage b/client/shared/scripts/restoreBaseImage
index 318e7c6f..fc777878 100755
--- a/client/shared/scripts/restoreBaseImage
+++ b/client/shared/scripts/restoreBaseImage
@@ -137,8 +137,13 @@ ogRestoreInfoImage $3 $4 2>&1 | tee -a $OGLOGCOMMAND
# Llamar al script de post-configuraciĆ³n del sistema operativo.
# Si a este script lo ha llamado el script restoreDiffImage no post-configuramos
if [ "$(ogGetCaller)" != "restoreDiffImage" ];then
+ if which configureOsCustom &>/dev/null; then
+ ogEcho log session "[90] configureOsCustom"
+ configureOsCustom "$3" "$4"
+ else
ogEcho log session "[90] $MSG_HELP_configureOs"
configureOs $3 $4
+ fi
fi
TIME=$[SECONDS-TIME1]
diff --git a/client/shared/scripts/restoreDiffImage b/client/shared/scripts/restoreDiffImage
index 9af1064f..b854f5c0 100755
--- a/client/shared/scripts/restoreDiffImage
+++ b/client/shared/scripts/restoreDiffImage
@@ -124,9 +124,13 @@ ogEcho log session "[70] $MSG_HELP_ogRestoreInfoImage"
ogRestoreInfoImage "$4" "$5" 2>&1 | tee -a $OGLOGCOMMAND
# Llamar al script de post-configuraciĆ³n del sistema operativo.
-ogEcho log session "[90] $MSG_HELP_configureOs."
-configureOs $4 $5
-
+if which configureOsCustom &>/dev/null; then
+ ogEcho log session "[90] configureOsCustom"
+ configureOsCustom "$4" "$5"
+else
+ ogEcho log session "[90] $MSG_HELP_configureOs."
+ configureOs $4 $5
+fi
TIME=$[SECONDS-TIME1]
ogEcho log session "[100] $MSG_SCRIPTS_END $MSG_SCRIPTS_TIME_TOTAL: $[TIME/60]m $[TIME%60]s"