diff options
| author | ramon <ramongomez@us.es> | 2015-06-05 12:48:04 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2015-06-05 12:48:04 +0000 |
| commit | e817dcea03ac138ad89dbfaa59771e2b833e1050 (patch) | |
| tree | 8921e83b676bcaebffeb0a184740ca1da36c610c | |
| parent | d3e23829022652356a1b2a23eb99803d23946201 (diff) | |
#673: Solucionar inicio duplicado de MySQL en Ubuntu 14.04 e integrar en {{{trunk}}} código de la revisión r4643.
git-svn-id: https://opengnsys.es/svn/trunk@4644 a21b9725-9963-47de-94b9-378ad31fedc9
| -rw-r--r-- | admin/WebConsole/comandos/jscripts/IniciarSesion.js | 2 | ||||
| -rwxr-xr-x | installer/opengnsys_installer.sh | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/admin/WebConsole/comandos/jscripts/IniciarSesion.js b/admin/WebConsole/comandos/jscripts/IniciarSesion.js index 343524e3..a46ecfdb 100644 --- a/admin/WebConsole/comandos/jscripts/IniciarSesion.js +++ b/admin/WebConsole/comandos/jscripts/IniciarSesion.js @@ -46,7 +46,7 @@ function confirmar(){ } } else { - ipfiltro=iptabla.replace(",", ";"); + ipfiltro=iptabla.replace(/,/g, ";"); } document.fdatosejecucion.filtro.value=ipfiltro; document.fdatosejecucion.atributos.value=atributos; diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh index 64e3631d..601c1f25 100755 --- a/installer/opengnsys_installer.sh +++ b/installer/opengnsys_installer.sh @@ -1455,6 +1455,12 @@ function openGnsysConfigure() OPENGNSYS_DIR="$INSTALL_TARGET" OPENGNSYS_USER="$OPENGNSYS_CLIENT_USER" APACHE_USER="$APACHE_RUN_USER" APACHE_GROUP="$APACHE_RUN_GROUP" $INSTALL_TARGET/bin/checkperms fi + # Evitar inicio de duplicado en Ubuntu 14.04 (Upstart y SysV Init). + if [ -f /etc/init/${MYSQLSERV}.conf ]; then + service=$MYSQLSERV + $DISABLESERVICE + fi + echoAndLog "${FUNCNAME}(): Starting OpenGnSys services." service="opengnsys" $ENABLESERVICE; $STARTSERVICE |