summaryrefslogtreecommitdiffstats
path: root/client/shared/scripts
diff options
context:
space:
mode:
authorramon <ramongomez@us.es>2017-11-13 09:17:20 +0000
committerramon <ramongomez@us.es>2017-11-13 09:17:20 +0000
commit1777170eab1ea72c56a8958812f29ff46f0d6a66 (patch)
tree4af47e88aee4a7babc75faab75a9e98daecdd97a /client/shared/scripts
parentb9bdfa03488ddb78fd2c768ab95ed4dc766a2f3e (diff)
#718: Script {{{configureOs}}} elimina antiguo cliente ogAdm... para Linux y Windows.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5507 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/shared/scripts')
-rwxr-xr-xclient/shared/scripts/configureOs22
1 files changed, 8 insertions, 14 deletions
diff --git a/client/shared/scripts/configureOs b/client/shared/scripts/configureOs
index 2adead3a..a19bf4ed 100755
--- a/client/shared/scripts/configureOs
+++ b/client/shared/scripts/configureOs
@@ -73,27 +73,21 @@ case "$OSTYPE" in
ogWindowsBootParameters $1 $2
# Registrar en Windows que la partición indicada es su nueva unidad C:\
ogWindowsRegisterPartition $1 $2 C $1 $2
- # Configurar nuevo agente OGAgent; si no, instalar antiguo cliente para Windows.
- ogConfigureOgagent $1 $2
- if [ $? == 0 ]; then
- # Si se ha configurado OGAgent, eliminar el antiguo cliente de Windows.
- [ -n "$(ogGetPath $MNTDIR/windows/ogAdmWinClient.exe)$(ogGetPath $MNTDIR/winnt/ogAdmWinClient.exe)" ] && ogUninstallWindowsClient $1 $2
- elif [ "${INSTALLOSCLIENT^^}" == "TRUE" ]; then
+ # Eliminar el antiguo cliente de Windows.
+ if [ -n "$(ogGetPath $MNTDIR/windows/ogAdmWinClient.exe)$(ogGetPath $MNTDIR/winnt/ogAdmWinClient.exe)" ]; then
ogInstallMiniSetup $1 $2 postconf.cmd
- ogInstallWindowsClient $1 $2 postconf.cmd
+ ogUninstallWindowsClient $1 $2 postconf.cmd
fi
+ # Configurar nuevo agente OGAgent.
+ ogConfigureOgagent $1 $2
;;
Linux) # Postconfiguración de GNU/Linux.
## Instala (no configura) el codigo de arranque del Grub en la partición (no lo configura, se mantiene el original de la imagen)
ogGrubInstallPartition $1 $2
- # Configurar nuevo agente OGAgent; si no, instalar antiguo cliente para Linux.
+ # Eliminar el antiguo cliente de Linux.
+ [ -n "$(find $MNTDIR/usr/sbin $MNTDIR/sbin $MNTDIR/usr/local/sbin -name ogAdmLnxClient -print)" ] && ogUninstallLinuxClient $1 $2
+ # Configurar nuevo agente OGAgent.
ogConfigureOgagent $1 $2
- if [ $? == 0 ]; then
- # Si se ha configurado OGAgent, eliminar el antiguo cliente de Linux.
- [ -n "$(find $MNTDIR/usr/sbin $MNTDIR/sbin $MNTDIR/usr/local/sbin -name ogAdmLnxClient -print)" ] && ogUninstallLinuxClient $1 $2
- elif [ "${INSTALLOSCLIENT^^}" == "TRUE" ]; then
- ogInstallLinuxClient $1 $2
- fi
;;
MacOS) # Postconfiguración de Mac OS X.
# Fichero indicador de activación de postconfiguración.