cherry-pick 6a60a24 b6641ee 75a1741

8 files changed, 22 insertions, 28 deletions

diff --git a/admin/Sources/Clients/ogagent/linux/debian/changelog b/admin/Sources/Clients/ogagent/linux/debian/changelog
index 203f74df..5bfa54df 100644
--- a/admin/Sources/Clients/ogagent/linux/debian/changelog
+++ b/admin/Sources/Clients/ogagent/linux/debian/changelog
@@ -6,9 +6,16 @@ ogagent-oglive (3.0.0-20190520) unstable; urgency=medium
 
 ogagent (1.1.1) unstable; urgency=medium
 
-  * OGAgent code retrieved from GitHub
+  * Set connection timeout
+  * Compatibility with "Exam Mode" from the University of Seville
 
- -- Ramón M. Gómez <ramongomez@us.es>  Sun, 3 Jun 2018 13:00:00 +0200
+ -- Ramón M. Gómez <ramongomez@us.es>  Thu, 23 May 2019 13:00:00 +0200
+
+ogagent (1.1.0a) stable; urgency=medium
+
+  * Fix a bug when activating the agent with some network devices
+
+ -- Ramón M. Gómez <ramongomez@us.es>  Wed, 22 May 2019 18:00:00 +0200
 
 ogagent (1.1.0) stable; urgency=medium
 
diff --git a/client/boot-tools/boottoolsfunctions.lib b/client/boot-tools/boottoolsfunctions.lib
index 7f7bbb38..da9cca2c 100755
--- a/client/boot-tools/boottoolsfunctions.lib
+++ b/client/boot-tools/boottoolsfunctions.lib
@@ -126,7 +126,14 @@ case "${1,,}" in
 	bionic-4.18) 	# ogLive 1.1.1-rc3 basado en Ubuntu 18.04 y Kernel 4.18.
 		OSDISTRIB="ubuntu"
 		OSCODENAME="bionic"
-		OSRELEASE="4.18.0-17-generic"
+		OSRELEASE="4.18.0-20-generic"
+		OSARCH="amd64"
+		OSHTTP="http://es.archive.ubuntu.com/ubuntu/"
+		;;
+	bionic-5.0) 	# ogLive 1.1.1-rc4 basado en Ubuntu 18.04 y Kernel 5.0.
+		OSDISTRIB="ubuntu"
+		OSCODENAME="bionic"
+		OSRELEASE="5.0.0-15-generic"
 		OSARCH="amd64"
 		OSHTTP="http://es.archive.ubuntu.com/ubuntu/"
 		;;
diff --git a/client/boot-tools/includes/etc/initramfs-tools/scripts/VERSION.txt b/client/boot-tools/includes/etc/initramfs-tools/scripts/VERSION.txt
index bc92b96f..2c8efadf 100644
--- a/client/boot-tools/includes/etc/initramfs-tools/scripts/VERSION.txt
+++ b/client/boot-tools/includes/etc/initramfs-tools/scripts/VERSION.txt
@@ -1 +1 @@
-OpenGnsys Client 1.1.1-rc3
+OpenGnsys Client 1.1.1-rc4
diff --git a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh
index 9a9fb764..32a9c733 100755
--- a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh
+++ b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareCompile.sh
@@ -19,26 +19,6 @@ which ms-sys || ms-sys install &>/dev/null
 echo  "spartlnx"
 which spartlnx.run || $(wget http://damien.guibouret.free.fr/savepart.zip &>/dev/null; unzip -o savepart.zip -d /sbin/)
 
-# Mach-O loader for Linux
-#echo "maloader"
-#apt-get install -y uuid-dev lib64z1 lib32z1
-#wget https://github.com/shinh/maloader/archive/master.zip
-#unzip master.zip
-#cd maloader-master
-#perl -pi -le 'print "#include <unistd.h>" if $. == 45' ld-mac.cc
-#if [ "$(arch)" == "x86_64" ]; then
-#    ln -fs /lib/x86_64-linux-gnu/libcrypto.so.1.0.0 /lib/libcrypto.so 2>/dev/null
-#    make release
-#else
-#    ln -fs /lib/i386-linux-gnu/libcrypto.so.1.0.0 /lib/libcrypto.so 2>/dev/null
-#    make clean
-#    make all BITS=32
-#fi
-#cp -va ld-mac /usr/bin
-#cp -va libmac.so /usr/lib
-#cd ..
-#rm -fr master.zip maloader-master
-
 popd
 export LANGUAGE=$OLDLANGUAGE
 export LC_ALL=$OLDLC_ALL
diff --git a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.basic b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.basic
index 31f2b559..73e1c2b9 100644
--- a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.basic
+++ b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.basic
@@ -4,7 +4,7 @@ install man-db
 install fbset
 install gdebi-core
 install bash-static
-install busybox-static  
+install busybox-static
 install console-data
 install locales
 install lshw 
diff --git a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.cloning b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.cloning
index 0092bd29..3e6a7666 100644
--- a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.cloning
+++ b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.cloning
@@ -5,7 +5,7 @@ install pxe-kexec
 install mbuffer
 install parted 
 install gdisk
-install chntpw 
+install chntpw
 install clonezilla
 install registry-tools
 install reglookup
diff --git a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.testing b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.testing
index 13cd2665..eca18286 100644
--- a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.testing
+++ b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.testing
@@ -16,7 +16,7 @@ install python-requests
 install fusioninventory-agent
 install nvme-cli
 install disktype
-install laptop-detect 
+install laptop-detect
 #install discover 
 #install casper 
 #install lupin-casper
diff --git a/client/shared/etc/preinit/fileslinks.sh b/client/shared/etc/preinit/fileslinks.sh
index b6fc7e2f..442c2920 100755
--- a/client/shared/etc/preinit/fileslinks.sh
+++ b/client/shared/etc/preinit/fileslinks.sh
@@ -32,7 +32,7 @@ if [ -n "$OPENGNSYS" ]; then
     # Enlaces para Qt Embeded.
     QTDIR="/usr/local"
     mkdir -p $QTDIR/{etc,lib,plugins}
-    for i in $OGLIB/qtlib/*; do
+    for i in $OGLIB/qtlib/* $OGLIB/fonts; do
         [ -f $QTDIR/lib/$i ] || ln -fs $i $QTDIR/lib 2>/dev/null
     done
     for i in $OGLIB/qtplugins/*; do