Merge branch 'ubuntu18-compatibility' into devel

4 files changed, 24 insertions, 1 deletions

diff --git a/client/engine/OgLiveAdapter.lib b/client/engine/OgLiveAdapter.lib
new file mode 100755
index 00000000..44f49534
--- /dev/null
+++ b/client/engine/OgLiveAdapter.lib
@@ -0,0 +1,15 @@
+#!/bin/bash
+#/**
+#@file    OgLiveAdapter
+#@brief   Librería o clase OgLiveAdapter
+#@class   OgLiveAdapter
+#@brief   Funciones o configuración para adaptar cambios en los comandos de los ogLive, de modo que no afecten al motor de clonación
+#@version 1.1.1
+#@warning License: GNU GPLv3+
+#*/
+
+set -a
+shopt -s expand_aliases
+
+# read: Configura el salto de línea como delimintador por defecto.
+alias read='read -d\n'
diff --git a/client/engine/Registry.lib b/client/engine/Registry.lib
index dbe69aee..60f7124b 100755
--- a/client/engine/Registry.lib
+++ b/client/engine/Registry.lib
@@ -15,7 +15,7 @@ function chntpw ()
 local CHNTPW
 CHNTPW=$(which drbl-chntpw)
 CHNTPW=${CHNTPW:-$(which chntpw)}
-timeout --foreground 5s $CHNTPW "$@"
+timeout --foreground 5s $CHNTPW -e "$@"
 }
 
 
diff --git a/repoman/bin/sendFileMcast b/repoman/bin/sendFileMcast
index 222a6d40..b7eeb303 100755
--- a/repoman/bin/sendFileMcast
+++ b/repoman/bin/sendFileMcast
@@ -11,6 +11,9 @@ OGBIN=$OPENGNSYS/bin
 PATH=$PATH:$OGBIN
 REPO_IFACE="$(/opt/opengnsys/bin/getRepoIface)"
 
+# Compatibilidad con Ubuntu 18
+source $OPENGNSYS/lib/osadapter.sh
+
 # Si se solicita, mostrar ayuda.
 if [ "$*" == "help" ]; then
     echo "Formato: $PROG fichero|nombreImagen datosMulticast"
diff --git a/server/lib/osadapter.sh b/server/lib/osadapter.sh
new file mode 100755
index 00000000..aa3c4774
--- /dev/null
+++ b/server/lib/osadapter.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+# Funciones o configuración para la compatibilidad con Ubuntu 18 en el servidor.
+set -a
+shopt -s expand_aliases
+alias read='read -d\n'