summaryrefslogtreecommitdiffstats
path: root/client/shared/etc/init/default.sh
diff options
context:
space:
mode:
authorramon <ramongomez@us.es>2016-04-25 11:50:24 +0000
committerramon <ramongomez@us.es>2016-04-25 11:50:24 +0000
commit62b144661849e2836a41fcbf69c61c331d7211e4 (patch)
treeb7f46a42e17aabac3c5858f0c84b068acf5a58ab /client/shared/etc/init/default.sh
parent6d9ad980f669c4da093749e56835971acb71837f (diff)
#724: Utilizar definitivamente la variable {{{ogactiveadmin}}} en lugar de {{{boot}}} para seleccionar el modo de arranque administrador del cliente, el cual no era detectado en distribuciones ogLive basadas en Ubuntu 15.10.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@4896 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/shared/etc/init/default.sh')
-rwxr-xr-xclient/shared/etc/init/default.sh13
1 files changed, 3 insertions, 10 deletions
diff --git a/client/shared/etc/init/default.sh b/client/shared/etc/init/default.sh
index e87b4b61..0e653e05 100755
--- a/client/shared/etc/init/default.sh
+++ b/client/shared/etc/init/default.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Proceso general de arranque de OpenGnSys Client.
+# Proceso general de arranque de OpenGnsys Client.
# Fichero de registro de incidencias (en el servidor; si no, en local).
@@ -13,15 +13,8 @@ LOGLEVEL=5
# Matando plymount para inicir browser o shell
pkill -9 plymouthd
-# Arranque de OpenGnSys Client daemon (web services).
-if [ -x $OPENGNSYS/job_executer/init.d/job_executer ]; then
- echo "Running Opengnsys client daemon (web services)"
- $OPENGNSYS/job_executer/init.d/job_executer restart
-fi
-
-# Arranque de OpenGnSys Client daemon (socket).
+# Arranque de OpenGnsys Client daemon (socket).
echo "${MSG_LAUNCHCLIENT:-.}"
-[ "$ogactiveadmin" == "true" ] && boot="admin"
# Indicar fichero de teclado de Qt para el idioma especificado (tipo "es.qmap").
[ -f /usr/local/etc/${LANG%_*}.qmap ] && export QWS_KEYBOARD="TTY:keymap=/usr/local/etc/${LANG%_*}.qmap"
@@ -37,7 +30,7 @@ else
fi
# Si fallo en cliente y modo "admin", cargar shell; si no, salir.
-if [ "$boot" == "admin" ]; then
+if [ "$ogactiveadmin" == "true" ]; then
bash
fi