From ed782169c25a8dfc0289f0f6482c604a2068db65 Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Mon, 16 Dec 2024 16:23:39 +0100
Subject: [PATCH 01/19] Modificaciones para browser

---
 includes/etc/environment                         | 9 +++++----
 includes/etc/initramfs-tools/hooks/oghooks       | 3 +++
 includes/etc/initramfs-tools/modules             | 3 +++
 includes/etc/initramfs-tools/scripts/ogfunctions | 4 ++++
 mkoglive.cfg                                     | 2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/includes/etc/environment b/includes/etc/environment
index bb529d9..dee8389 100644
--- a/includes/etc/environment
+++ b/includes/etc/environment
@@ -1,4 +1,5 @@
-LC_TYPE=es_ES@euro
-LC_ALL=es_ES@euro
-LANG=es_ES@euro
-LANGUAGE=es_ES@euro
\ No newline at end of file
+LC_TYPE=es_ES.UTF-8@euro
+LC_ALL=es_ES.UTF-8@euro
+LANG=es_ES.UTF-8@euro
+LANGUAGE=es_ES.UTF-8@euro
+XDG_RUNTIME_DIR=/run/user/0
diff --git a/includes/etc/initramfs-tools/hooks/oghooks b/includes/etc/initramfs-tools/hooks/oghooks
index 6e58b79..0aa3dbf 100755
--- a/includes/etc/initramfs-tools/hooks/oghooks
+++ b/includes/etc/initramfs-tools/hooks/oghooks
@@ -38,6 +38,9 @@ mkdir -p ${DESTDIR}/var/log
 mkdir -p ${DESTDIR}/opt/opengnsys;
 mkdir -p ${DESTDIR}/ogboot;
 mkdir -p ${DESTDIR}/boot;
+mkdir -p ${DESTDIR}/run/user/0
+chmod chmod 700 ${DESTDIR}/run/user/0
+
 
 # Insert basic binaries
 copy_exec /bin/bash-static /bin/bash
diff --git a/includes/etc/initramfs-tools/modules b/includes/etc/initramfs-tools/modules
index 78a2598..6c4a0a7 100644
--- a/includes/etc/initramfs-tools/modules
+++ b/includes/etc/initramfs-tools/modules
@@ -15,6 +15,9 @@
 #fbcon
 
 # Kernel 3.7+ video.
+virtio_gpu
+vmwgfx
+
 uvesafb
 
 # Generales
diff --git a/includes/etc/initramfs-tools/scripts/ogfunctions b/includes/etc/initramfs-tools/scripts/ogfunctions
index 4d96f7e..d1b5d3b 100644
--- a/includes/etc/initramfs-tools/scripts/ogfunctions
+++ b/includes/etc/initramfs-tools/scripts/ogfunctions
@@ -312,6 +312,10 @@ ogPostConfigureFS()
     ogtmpfs="${ogtmpfs:-15}"
     mount tmpfs /var/cache/apt/archives -t tmpfs -o size=${ogtmpfs}M
     mkdir -p /var/cache/apt/archives/partial
+
+    mkdir -p /run/user/0
+    chmod 700 /run/user/0
+
 }
 
 
diff --git a/mkoglive.cfg b/mkoglive.cfg
index c5a910d..ed49936 100644
--- a/mkoglive.cfg
+++ b/mkoglive.cfg
@@ -108,7 +108,7 @@ filesystem_remote =
   #nfs-common    # Provoca error de instalación en Ubuntu 15.04
   #bittornado    # ogLive anterior a Ubuntu 20.04
 
-monitoring = htop ncdu bwbar bmon iftop ifstat dstat hdparm sdparm blktool testdisk
+monitoring = htop ncdu bwbar bmon iftop ifstat dstat hdparm sdparm blktool testdisk kitty-terminfo
 
 networking = netpipes curl wget tftp-hpa dnsutils
   #trickle       # ubuntu noble: has no installation candidate
-- 
2.40.1


From 0ca148775e3fc04028c380e8bb3b76a6021956d8 Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Mon, 16 Dec 2024 16:36:38 +0100
Subject: [PATCH 02/19] Fix typo

---
 includes/etc/initramfs-tools/hooks/oghooks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/etc/initramfs-tools/hooks/oghooks b/includes/etc/initramfs-tools/hooks/oghooks
index 0aa3dbf..99375b2 100755
--- a/includes/etc/initramfs-tools/hooks/oghooks
+++ b/includes/etc/initramfs-tools/hooks/oghooks
@@ -39,7 +39,7 @@ mkdir -p ${DESTDIR}/opt/opengnsys;
 mkdir -p ${DESTDIR}/ogboot;
 mkdir -p ${DESTDIR}/boot;
 mkdir -p ${DESTDIR}/run/user/0
-chmod chmod 700 ${DESTDIR}/run/user/0
+chmod 700 ${DESTDIR}/run/user/0
 
 
 # Insert basic binaries
-- 
2.40.1


From 434cfb865e72dda9ca1c6a7ba0cae42b2f7f3afb Mon Sep 17 00:00:00 2001
From: Vadim Trochinsky <git@vadim.ws>
Date: Wed, 18 Dec 2024 12:40:30 +0100
Subject: [PATCH 03/19] Change python3-xattr to python3-pyxattr -- that's the
 correct one

---
 mkoglive.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkoglive.cfg b/mkoglive.cfg
index ed49936..ba7958b 100644
--- a/mkoglive.cfg
+++ b/mkoglive.cfg
@@ -130,5 +130,5 @@ xwindows =
   #roxterm gparted       #+80M
   #openbox midori        #xvesa en compilacion
 
-oggit = python3 python3-git python3-xattr python3-libarchive-c python3-pylibacl python3-pip opengnsys-libarchive-c python3-termcolor bsdextrautils opengnsys-pyblkid ntfs-3g-system-compression python3-tqdm
+oggit = python3 python3-git python3-pyxattr python3-libarchive-c python3-pylibacl python3-pip opengnsys-libarchive-c python3-termcolor bsdextrautils opengnsys-pyblkid ntfs-3g-system-compression python3-tqdm
  
-- 
2.40.1


From 545278607888eeb94b8c33ef92f0fe5dff8ddcb9 Mon Sep 17 00:00:00 2001
From: Vadim Trochinsky <git@vadim.ws>
Date: Wed, 18 Dec 2024 12:43:10 +0100
Subject: [PATCH 04/19] Add packages to support ogbrowser

---
 mkoglive.cfg | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mkoglive.cfg b/mkoglive.cfg
index ba7958b..1aa9254 100644
--- a/mkoglive.cfg
+++ b/mkoglive.cfg
@@ -130,5 +130,7 @@ xwindows =
   #roxterm gparted       #+80M
   #openbox midori        #xvesa en compilacion
 
+ogbrowser = sway libinput-tools
+
 oggit = python3 python3-git python3-pyxattr python3-libarchive-c python3-pylibacl python3-pip opengnsys-libarchive-c python3-termcolor bsdextrautils opengnsys-pyblkid ntfs-3g-system-compression python3-tqdm
  
-- 
2.40.1


From 7fdbcdea98cb274252defaa07bdb5b7aa0e67fad Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Wed, 18 Dec 2024 22:33:09 +0100
Subject: [PATCH 05/19] test

---
 mkoglive.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkoglive.cfg b/mkoglive.cfg
index 1aa9254..3ea8c5a 100644
--- a/mkoglive.cfg
+++ b/mkoglive.cfg
@@ -130,7 +130,7 @@ xwindows =
   #roxterm gparted       #+80M
   #openbox midori        #xvesa en compilacion
 
-ogbrowser = sway libinput-tools
+ogbrowser = sway libinput-tools hwdata
 
 oggit = python3 python3-git python3-pyxattr python3-libarchive-c python3-pylibacl python3-pip opengnsys-libarchive-c python3-termcolor bsdextrautils opengnsys-pyblkid ntfs-3g-system-compression python3-tqdm
  
-- 
2.40.1


From 919b4c58c080025f6eba600d754ac6aece34ffb1 Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Mon, 10 Feb 2025 16:00:42 +0100
Subject: [PATCH 06/19] Fix udev for browser/wayland

---
 includes/etc/initramfs-tools/scripts/ogfunctions | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/includes/etc/initramfs-tools/scripts/ogfunctions b/includes/etc/initramfs-tools/scripts/ogfunctions
index d1b5d3b..c12407e 100644
--- a/includes/etc/initramfs-tools/scripts/ogfunctions
+++ b/includes/etc/initramfs-tools/scripts/ogfunctions
@@ -316,6 +316,8 @@ ogPostConfigureFS()
     mkdir -p /run/user/0
     chmod 700 /run/user/0
 
+    # esto completa la inicializacion de udev y permite el inicio del escritorio grafico
+    /bin/udevadm trigger
 }
 
 
-- 
2.40.1


From 958143f24f2bd32baadeb369d4eb6c5cf8ea4655 Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Tue, 11 Feb 2025 09:52:43 +0100
Subject: [PATCH 07/19] Disable chromium sandbox, makes execution as root
 possible

---
 includes/etc/environment | 1 +
 1 file changed, 1 insertion(+)

diff --git a/includes/etc/environment b/includes/etc/environment
index dee8389..f00e250 100644
--- a/includes/etc/environment
+++ b/includes/etc/environment
@@ -3,3 +3,4 @@ LC_ALL=es_ES.UTF-8@euro
 LANG=es_ES.UTF-8@euro
 LANGUAGE=es_ES.UTF-8@euro
 XDG_RUNTIME_DIR=/run/user/0
+QTENGINE_CHROMIUM_FLAGS=--no-sandbox
-- 
2.40.1


From ffa0803aab0aeac7e80db53c91022485012c0ef5 Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Tue, 11 Feb 2025 09:53:06 +0100
Subject: [PATCH 08/19] Enable SHM memory in oglive

---
 includes/etc/initramfs-tools/scripts/ogfunctions | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/includes/etc/initramfs-tools/scripts/ogfunctions b/includes/etc/initramfs-tools/scripts/ogfunctions
index c12407e..1edc75c 100644
--- a/includes/etc/initramfs-tools/scripts/ogfunctions
+++ b/includes/etc/initramfs-tools/scripts/ogfunctions
@@ -318,6 +318,12 @@ ogPostConfigureFS()
 
     # esto completa la inicializacion de udev y permite el inicio del escritorio grafico
     /bin/udevadm trigger
+
+    # Memoria compartida -- necesario para browser
+    mkdir -p /dev/shm
+    mount tmpfs -t tmpfs /dev/shm
+    chmod 1777 /dev/shm
+
 }
 
 
-- 
2.40.1


From 42aceb750f9eaac4d0c62087de5ab2465a2cd064 Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Tue, 11 Feb 2025 12:40:19 +0100
Subject: [PATCH 09/19] Fix environment variable name

---
 includes/etc/environment | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/etc/environment b/includes/etc/environment
index f00e250..231fa9d 100644
--- a/includes/etc/environment
+++ b/includes/etc/environment
@@ -3,4 +3,4 @@ LC_ALL=es_ES.UTF-8@euro
 LANG=es_ES.UTF-8@euro
 LANGUAGE=es_ES.UTF-8@euro
 XDG_RUNTIME_DIR=/run/user/0
-QTENGINE_CHROMIUM_FLAGS=--no-sandbox
+QTWEBENGINE_CHROMIUM_FLAGS=--no-sandbox
-- 
2.40.1


From e103f9bf6abbfca6912556f3433b19bd30cb91ac Mon Sep 17 00:00:00 2001
From: Vadim Trochinsky <git@vadim.ws>
Date: Thu, 13 Feb 2025 09:56:41 +0100
Subject: [PATCH 10/19] Prototipo de oglive con X11

---
 .../etc/initramfs-tools/scripts/ogfunctions   | 152 +++++++++---------
 includes/usr/bin/browser                      |  17 ++
 mkoglive.cfg                                  |   5 +-
 3 files changed, 96 insertions(+), 78 deletions(-)
 create mode 100644 includes/usr/bin/browser

diff --git a/includes/etc/initramfs-tools/scripts/ogfunctions b/includes/etc/initramfs-tools/scripts/ogfunctions
index 1edc75c..c5f7b7d 100644
--- a/includes/etc/initramfs-tools/scripts/ogfunctions
+++ b/includes/etc/initramfs-tools/scripts/ogfunctions
@@ -110,8 +110,8 @@ fi
 #/**
 #       ogExportVarEnvironment
 #@brief   Exporta las variables usadas en el proceso de inicio OpenGnsys y las almacena en /tmp
-#@param   
-#@return  
+#@param
+#@return
 #@exception OG_ERR_FORMAT    Formato incorrecto.
 #@version 0.9
 #@author Antonio J. Doblas. Universidad de Malaga.
@@ -119,7 +119,7 @@ fi
 #*/ ##
 ogExportVarEnvironment ()
 {
-	export CFGINITRD="/tmp/initrd.cfg"	
+	export CFGINITRD="/tmp/initrd.cfg"
 	OGPROTOCOL="${ogprotocol:-smb}"
 	[ "$ogunit" != "" ] && OGUNIT="/$ogunit"
 	# OPTIONS Para samba y local (a nfs no le afecta)
@@ -127,16 +127,16 @@ ogExportVarEnvironment ()
 	DEFOGLIVE="ogclient"
 	export OGLIVEDIR="${oglivedir:-$DEFOGLIVE}" && echo "OGLIVEDIR=$OGLIVEDIR" >> $CFGINITRD
 	case "$OGPROTOCOL" in
-		nfs|NFS)			
-			export SRCOGLIVE="/var/lib/tftpboot" && echo "SRCOGLIVE=$SRCOGLIVE" >> $CFGINITRD	
+		nfs|NFS)
+			export SRCOGLIVE="/var/lib/tftpboot" && echo "SRCOGLIVE=$SRCOGLIVE" >> $CFGINITRD
 			export SRCOGSHARE="/opt/opengnsys/client" && echo "SRCOGSHARE=$SRCOGSHARE" >> $CFGINITRD
-			export SRCOGLOG="/opt/opengnsys/log/clients" && echo "SRCOGLOG=$SRCOGLOG" >> $CFGINITRD	
-			export SRCOGIMAGES="/opt/opengnsys/images$OGUNIT" && echo "SRCOGIMAGES=$SRCOGIMAGES" >> $CFGINITRD	
+			export SRCOGLOG="/opt/opengnsys/log/clients" && echo "SRCOGLOG=$SRCOGLOG" >> $CFGINITRD
+			export SRCOGIMAGES="/opt/opengnsys/images$OGUNIT" && echo "SRCOGIMAGES=$SRCOGIMAGES" >> $CFGINITRD
 		;;
 		smb|SMB|cifs|CIFS|samba|SAMBA)
 			export SRCOGLIVE="tftpboot"  && echo "SRCOGLIVE=$SRCOGLIVE" >> $CFGINITRD
 			export SRCOGSHARE="ogclient" && echo "SRCOGSHARE=$SRCOGSHARE" >> $CFGINITRD
-			export SRCOGLOG="oglog" && echo "SRCOGLOG=$SRCOGLOG" >> $CFGINITRD	
+			export SRCOGLOG="oglog" && echo "SRCOGLOG=$SRCOGLOG" >> $CFGINITRD
 			export SRCOGIMAGES="ogimages$OGUNIT" && echo "SRCOGIMAGES=$SRCOGIMAGES" >> $CFGINITRD
 		;;
 		local|LOCAL)
@@ -149,7 +149,7 @@ ogExportVarEnvironment ()
 	esac
 	#punto de acceso al boot-tools live
 	export DSTOGLIVE="/opt/oglive/tftpboot"
-	#punto de montaje para unionfs 
+	#punto de montaje para unionfs
 	export OGLIVERAMFS="/opt/oglive/ramfs" && echo "OGLIVERAMFS=$OGLIVERAMFS" >> $CFGINITRD
 	#punto de montaje donde se accede al 2nd FS mediante loop
 	export OGLIVEROOTFS="/opt/oglive/rootfs" && echo "OGLIVEROOTFS=$OGLIVEROOTFS" >> $CFGINITRD
@@ -157,13 +157,13 @@ ogExportVarEnvironment ()
 	export OGLIVEUNIONFS="/opt/oglive/unionfs" && echo "OGLIVEUNIONFS=$OGLIVEUNIONFS" >> $CFGINITRD
 	#etiquta para los dispositivos offline
 	export OGLIVELABEL="ogClient"
-	
+
 	#echo "puntos de montajes para los demas accesos"
 	#echo "acceso al client, engine, scritps, interfaz"
-	export DSTOGSHARE="/opt/opengnsys" && echo "DSTOGSHARE=$DSTOGSHARE" >> $CFGINITRD		
+	export DSTOGSHARE="/opt/opengnsys" && echo "DSTOGSHARE=$DSTOGSHARE" >> $CFGINITRD
 	export DSTOGLOG="/opt/opengnsys/log" && echo "DSTOGLOG=$DSTOGLOG" >> $CFGINITRD
 	export DSTOGIMAGES="/opt/opengnsys/images" && echo "DSTOGIMAGES=$DSTOGIMAGES" >> $CFGINITRD
-		
+
 	##INFORMACION DE OTRAS VARIABLES OBTENDIAS EN OTRAS FUNCIONES ogConfigureNetwork.
 		#DEVICE
 		#IPV4DDR
@@ -185,8 +185,8 @@ ogExportVarEnvironment ()
 #/**
 #       ogConfigureRamfs
 #@brief   Configura el initrd para adaptarlo al sistema raiz.
-#@param   
-#@return  
+#@param
+#@return
 #@exception OG_ERR_FORMAT    Formato incorrecto.
 #@version 0.9
 #@author Antonio J. Doblas. Universidad de Malaga.
@@ -194,10 +194,10 @@ ogExportVarEnvironment ()
 #*/ ##
 ogConfigureRamfs ()
 {
-	mkdir -p $DSTOGLIVE	
-	mkdir -p $OGLIVERAMFS	
-	mkdir -p $OGLIVEROOTFS	  			 
-	mkdir -p $OGLIVEUNIONFS 
+	mkdir -p $DSTOGLIVE
+	mkdir -p $OGLIVERAMFS
+	mkdir -p $OGLIVEROOTFS
+	mkdir -p $OGLIVEUNIONFS
 
 	touch /etc/fstab
 }
@@ -206,8 +206,8 @@ ogConfigureRamfs ()
 #/**
 #       ogLoadNetModule
 #@brief   Carga en un demerminado modulo de red, requiere compilación previo del modulo
-#@param   
-#@return  
+#@param
+#@return
 #@exception OG_ERR_FORMAT    Formato incorrecto.
 #@version 0.9
 #@author Antonio J. Doblas. Universidad de Malaga.
@@ -226,8 +226,8 @@ ogLoadNetModule ()
 #/**
 #      ogPostConfigureFS
 #@brief   Configura el sistema raiz, para independizarlo entre los clientes.
-#@param   
-#@return  
+#@param
+#@return
 #@exception OG_ERR_FORMAT    Formato incorrecto.
 #@version 0.9
 #@author Antonio J. Doblas. Universidad de Malaga.
@@ -237,29 +237,29 @@ ogPostConfigureFS()
 {
 	# configuramos el /etc/hostname.
 	echo $HOSTNAME > /etc/hostname
-	
+
 	#configuramos el /etc/hosts
 	echo "127.0.0.1 localhost" > /etc/hosts
 	echo "$IPV4ADDR $HOSTNAME" >> /etc/hosts
-	
+
 	#configuramos el host.conf
 	echo "order hosts,bind" > /etc/host.conf
 	echo "multi on" >> /etc/host.conf
-	
+
 	#configuramos el dns anterior ubuntu 12.04 (parámetro del Kernel "ogdns=IP_DNS")
 	if [ -n "$ogdns" ]; then
 		mkdir -p /run/resolvconf
 		echo "nameserver $ogdns" > /run/resolvconf/resolv.conf
 	fi
-	
+
 	#configuramos el uso del servicio http proxy (parámetro del Kernel "ogproxy=URL_Proxy")
 	if [ -n "${ogproxy}" ]; then
 		export http_proxy="$ogproxy"
 		export https_proxy="$ogproxy"
 		export ftp_proxy="$ogproxy"
-		export ftps_proxy="$ogproxy"   	
-	fi	
-	
+		export ftps_proxy="$ogproxy"
+	fi
+
 	# configuramos el /etc/networks
 	#read -e NETIP NETDEFAULT <<<$(route -n | grep eth0 | awk -F" " '{print $1}')
 	NETIP=$(route -n | grep eth0 | awk -F" " '{print $1}') && NETIP=$(echo $NETIP | cut -f1 -d" ")
@@ -310,7 +310,7 @@ ogPostConfigureFS()
 
 	#Montamos un directorio temporal para permitir instalacion de softare desde el comando apt-get (parametor kernel "ogtmpfs=50" valor en megas
     ogtmpfs="${ogtmpfs:-15}"
-    mount tmpfs /var/cache/apt/archives -t tmpfs -o size=${ogtmpfs}M
+    #mount tmpfs /var/cache/apt/archives -t tmpfs -o size=${ogtmpfs}M
     mkdir -p /var/cache/apt/archives/partial
 
     mkdir -p /run/user/0
@@ -336,8 +336,8 @@ ogPostConfigureFS()
 # si la red ha sido configurada con el parametro de kernel ip, será el segundo valor.
 ## ip=iphost:ipnext-server:ipgateway:netmask:hostname:iface:none
 ## ip=172.17.36.21:62.36.225.150:172.17.36.254:255.255.255.0:prueba1:eth0:none
-#@param   
-#@return  
+#@param
+#@return
 #@exception OG_ERR_FORMAT    Formato incorrecto.
 #@version 0.9
 #@author Antonio J. Doblas. Universidad de Malaga.
@@ -367,13 +367,13 @@ ogGetROOTSERVER ()
 	fi
 	export ROOTSERVER
 	echo "ROOTSERVER=$ROOTSERVER" >> $CFGINITRD
-	
+
 	#si oglive no oglive=R
-	export OGSERVERIMAGES="${ogrepo:-$ROOTSERVER}" && echo "OGSERVERIMAGES=$OGSERVERIMAGES" >> $CFGINITRD 
+	export OGSERVERIMAGES="${ogrepo:-$ROOTSERVER}" && echo "OGSERVERIMAGES=$OGSERVERIMAGES" >> $CFGINITRD
 	export OGSERVERSHARE="${ogshare:-$ROOTSERVER}" && echo "OGSERVERSHARE=$OGSERVERSHARE" >> $CFGINITRD
 	export OGSERVERLOG="${oglog:-$ROOTSERVER}" && echo "OGSERVERLOG=$OGSERVERLOG" >> $CFGINITRD
 	export OGSERVERLIVE="${oglive:-$OGSERVERIMAGES}" && echo "OGSERVERLIVE=$OGSERVERLIVE" >> $CFGINITRD
-		
+
 	return 0
 }
 
@@ -381,8 +381,8 @@ ogGetROOTSERVER ()
 
 #       ogUpdateInitrd
 #@brief   Actualiza el initrd de la cache desde el servidor. Si el arranque ha sido desde cache, comprueba desde el servidor nueva version del initird.
-#@param1 
-#@return  
+#@param1
+#@return
 #@exception OG_ERR_FORMAT    Formato incorrecto.
 #@version 0.9
 #@author Antonio J. Doblas. Universidad de Malaga.
@@ -406,26 +406,26 @@ ogUpdateInitrd ()
 	[ -z "$TYPE" ] && return
 	mount -t $TYPE LABEL=CACHE /tmp/cache || return
 	mkdir -p /tmp/cache/boot/$OGLIVEDIR
-	
-	
+
+
 	# comparamos los del server
 	busybox tftp -g -r $OGLIVEDIR/ogvmlinuz.sum $ROOTSERVER
 	busybox tftp -g -r $OGLIVEDIR/oginitrd.img.sum $ROOTSERVER
 	SERVERVMLINUZ=`cat ogvmlinuz.sum`
 	SERVERINITRD=`cat oginitrd.img.sum`
 
-	
+
 	#comparamos los de la cache
 	CACHEVMLINUZ=`cat /tmp/cache/boot/$OGLIVEDIR/ogvmlinuz.sum`
 	CACHEINITRD=`cat /tmp/cache/boot/$OGLIVEDIR/oginitrd.img.sum`
-	
+
 	echo "MD5 on SERVER: $SERVERVMLINUZ $SERVERINITRD"
 	echo "MD5 on  CACHE: $CACHEVMLINUZ $CACHEINITRD"
-	
+
 	cd /tmp/cache/boot/$OGLIVEDIR || mkdir -p /tmp/cache/boot/$OGLIVEDIR
-	
+
 	if [ "$CACHEVMLINUZ" != "$SERVERVMLINUZ" ]
-	then		
+	then
 		echo "ogvmlinuz updating"
 		busybox tftp -g -r $OGLIVEDIR/ogvmlinuz $ROOTSERVER
 		busybox tftp -g -r $OGLIVEDIR/ogvmlinuz.sum $ROOTSERVER
@@ -453,13 +453,13 @@ ogUpdateInitrd ()
 #@param3 punto de acceso remoto
 #@param4  punto de montaje local
 #@param5 acceso de lectura tipo ",ro"
-#@return  
+#@return
 #@exception OG_ERR_FORMAT    Formato incorrecto.
 #@version 0.9
 #@author Antonio J. Doblas. Universidad de Malaga.
 #@date    2011/05/24
 #*/ ##
-   
+
 ogConnect ()
 {
 	SERVER=$1
@@ -467,13 +467,13 @@ ogConnect ()
 	SRC=$3
 	DST=$4
 	READONLY=$5
-	
+
 	case "$PROTOCOL" in
 		nfs)
 			nfsmount  ${SERVER}:${SRC} ${DST} -o nolock${READONLY} 2> /dev/null || mount.nfs ${SERVER}:${SRC} ${DST} -o nolock${READONLY}
 		;;
 		smb)
-			mount.cifs //${SERVER}/${SRC} ${DST} ${OPTIONS}${READONLY}		
+			mount.cifs //${SERVER}/${SRC} ${DST} ${OPTIONS}${READONLY}
 		;;
 		local)
 		   # Comprobamos que estatus sea online y que la variable del server no esta vacia.
@@ -497,21 +497,21 @@ ogConnect ()
 #/**
 #       ogConnectOgLive
 #@brief   Conecta con el recurso para usar el sistema raiz externo, remoto o local
-#@param1 
-#@return  
+#@param1
+#@return
 #@exception OG_ERR_FORMAT    Formato incorrecto.
 #@version 0.9
 #@author Antonio J. Doblas. Universidad de Malaga.
-#@date    2011/05/24	
+#@date    2011/05/24
 ogConnectOgLive ()
 {
 # Si ogprotocol=local, la funcion ogExportVar => SRCOGLIVE=local
 	if [ "$SRCOGLIVE" == "local" ]
-	then		
+	then
 		echo  "Montar imagen del sistema root desde dispositivo local"
 		for i in $(blkid /dev/s* | grep $OGLIVELABEL  | awk -F: '{print $2}' | tr -d \"); do export $i; done
-		# si local usb| cd con partcion es identificada como label $OGLIVELABEL		 
-		mount -t $TYPE LABEL=$OGLIVELABEL $DSTOGLIVE  
+		# si local usb| cd con partcion es identificada como label $OGLIVELABEL
+		mount -t $TYPE LABEL=$OGLIVELABEL $DSTOGLIVE
 		if [ $? != 0 ]
 		then
 			# Si local es particion CACHE es identificada como CACHE
@@ -520,8 +520,8 @@ ogConnectOgLive ()
 		fi
 	else
 		# Si ogprotocol es remoto.    TODO en smb rw y en nfs ro??
-		ogConnect $OGSERVERLIVE $OGPROTOCOL $SRCOGLIVE $DSTOGLIVE 		
-	fi		
+		ogConnect $OGSERVERLIVE $OGPROTOCOL $SRCOGLIVE $DSTOGLIVE
+	fi
 # Si el montaje ha sido correcto, tanto en local como en remoto. Procedemos con la union
 	ogMergeLive
 }
@@ -530,21 +530,21 @@ ogConnectOgLive ()
 #/**
 #       ogMergeLive
 #@brief   Metafuncion para fusionar el initrd con el sistema raiz.
-#@param1 
-#@return  
+#@param1
+#@return
 #@exception OG_ERR_FORMAT    Formato incorrecto.
 #@version 0.9
 #@author Antonio J. Doblas. Universidad de Malaga.
-#@date    2011/05/24	
+#@date    2011/05/24
 ogMergeLive()
 {
-#Si existe en el punto de acceso del del oglive el fichero ogclient.sqfs	
+#Si existe en el punto de acceso del del oglive el fichero ogclient.sqfs
 if [ ! -d $DSTOGLIVE/$OGLIVEDIR ]; then
 	echo "Usando ogLive por defecto."
 	export OGLIVEDIR=$DEFOGLIVE
 fi
 if [ -f $DSTOGLIVE/$OGLIVEDIR/ogclient.sqfs ]
-then	
+then
 	cat /proc/mounts > /tmp/mtab.preunion
 	if [ "$og2nd" == "img" ]
 	then
@@ -556,7 +556,7 @@ then
 		## Montamos el ROOTFS tipo squashfs
 		mount $DSTOGLIVE/$OGLIVEDIR/ogclient.sqfs $OGLIVEROOTFS -t squashfs -o loop
 	fi
-# Realizamos la union entre el ogliveram(initrd) y el ogliverootfs(ogclient.sqfs)	
+# Realizamos la union entre el ogliveram(initrd) y el ogliverootfs(ogclient.sqfs)
 # Nota: el orden es muy importante para evitar errores de montaje.
 	[ -d $OGLIVEROOTFS/lib32 ] && LIBS=lib32
 	for i in bin sbin lib $LIBS etc var usr root boot; do
@@ -574,8 +574,8 @@ fi
 #/**
 #       ogUnionLiveDir
 #@brief  fusiona dos directorios con unionfs
-#@param1 
-#@return  
+#@param1
+#@return
 #@exception OG_ERR_FORMAT    Formato incorrecto.
 #@version 0.9
 #@author Antonio J. Doblas. Universidad de Malaga.
@@ -601,8 +601,8 @@ ogUnionLiveDir()
 #/**
 #     ogConfigureLoopback
 #@brief   Configura la interfaz loopback para cliente torrent
-#@param   
-#@return  
+#@param
+#@return
 #@exception OG_ERR_FORMAT    Formato incorrecto.
 #@version 0.9   Usando funciones generales de ubuntu
 #@author Antonio J. Doblas. Universidad de Malaga.
@@ -621,8 +621,8 @@ ogConfigureLoopback()
 #/**
 #    ogConfigureNetworking
 #@brief   Configura la interfaz de red usada en el pxe
-#@param   
-#@return  
+#@param
+#@return
 #@exception OG_ERR_FORMAT    Formato incorrecto.
 #@version 0.9
 #@author Antonio J. Doblas. Universidad de Malaga.
@@ -631,7 +631,7 @@ ogConfigureLoopback()
 ogConfigureNetworking()
 {
 #echo "ogConfigureNetworking: Buscando interfaz a configurar DEVICE"
-if [ -n "${BOOTIF}" ] 
+if [ -n "${BOOTIF}" ]
 then
 	#echo " variable BOOTIF exportada con pxelinux.0 con valor $BOOTIF"
 	IP=$IPOPTS
@@ -685,7 +685,7 @@ if [ -z "${DEVICE}" ]; then
 fi
 
 [ -n "${DEVICE}" ] && [ -e /run/net-"${DEVICE}".conf ] && return 0
-#if [ -n "${DEVICE}" ] && [ -e /run/net-"${DEVICE}".conf ]; then 
+#if [ -n "${DEVICE}" ] && [ -e /run/net-"${DEVICE}".conf ]; then
 #	echo "variable DEVICE con valor $DEVICE  y fichero /run/net-$DEVICE encontrados"
 #	return 0
 #else
@@ -745,7 +745,7 @@ for ROUNDTTT in 2 3 4 6 9 16 25 36 64 100; do
 done
 
 # source ipconfig output
-if [ -n "${DEVICE}" ]; then	
+if [ -n "${DEVICE}" ]; then
 	export DEVICE
 	export DEVICECFG="/run/net-${DEVICE}.conf"
 	# En algunos casos, el fichero de configuración está en /tmp.
@@ -767,11 +767,11 @@ fi
 #    ogYesNo
 #@brief   Gestion de peticiones de usuario en modo ogdebug=true
 #@param1  OPTIONS    --timeout N    --default ANSWER
-#@param1 Questions   
+#@param1 Questions
 #@return  1=yes 0=no
 #@exception OG_ERR_FORMAT    Formato incorrecto.
 #@version 0.9
-#@author:  
+#@author:
 #@date    2010/05/24
 #*/ ##
 ogYesNo()
@@ -838,7 +838,7 @@ ogYesNo()
                 ans=$default
             else
                 ans=$(echo $ans | tr '[:upper:]' '[:lower:]')
-            fi 
+            fi
         fi
 
         if [[ "$ans" == 'y'  ||  "$ans" == 'yes'  ||  "$ans" == 'n'  ||  "$ans" == 'no' ]]; then
@@ -848,5 +848,5 @@ ogYesNo()
         if [[ $ok -eq 0 ]]; then warning "Valid answers are: yes y no n"; fi
     done
     [[ "$ans" = "y" || "$ans" == "yes" ]]
-} 
- 
+}
+
diff --git a/includes/usr/bin/browser b/includes/usr/bin/browser
new file mode 100644
index 0000000..b437bed
--- /dev/null
+++ b/includes/usr/bin/browser
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# argumentos $0 -qws url
+ignored_args="$1"
+url="$2"
+
+
+mkdir -p $HOME/.config/sway
+echo "exec OGBrowser $url" > $HOME/.config/sway/config
+
+mkdir -p $HOME/.config/i3
+echo "exec OGBrowser $url" > $HOME/.config/i3/config
+echo "exec i3" > $HOME/.xinitrc
+
+sway || startx
+
+
diff --git a/mkoglive.cfg b/mkoglive.cfg
index 3ea8c5a..29ec24f 100644
--- a/mkoglive.cfg
+++ b/mkoglive.cfg
@@ -92,7 +92,7 @@ filesystem_local =
   dmraid dmsetup lvm2 e2fsprogs
   jfsutils reiserfsprogs reiser4progs xfsprogs mhddfs hfsplus hfsprogs hfsutils nilfs-tools vmfs-tools
   btrfs-progs               # ogLive a partir de Ubuntu 20.04
-  zfsutils-linux            # ogLive a partir de Ubuntu 16.04
+  #zfsutils-linux            # ogLive a partir de Ubuntu 16.04 -- desactivado temporalmente
   android-tools-adb         # ogLive a partir de Ubuntu 16.04
   android-tools-fastboot    # ogLive a partir de Ubuntu 16.04
   f2fs-tools
@@ -126,6 +126,7 @@ testing =
 
 xwindows =
   v86d                   # VESA Kernel 3.7+
+  icewm xserver-common xserver-xorg xserver-xorg-core xserver-xorg-input-all xserver-xorg-video-all xinit i3
   #xorg-dev xorg lxde    #+300M
   #roxterm gparted       #+80M
   #openbox midori        #xvesa en compilacion
@@ -133,4 +134,4 @@ xwindows =
 ogbrowser = sway libinput-tools hwdata
 
 oggit = python3 python3-git python3-pyxattr python3-libarchive-c python3-pylibacl python3-pip opengnsys-libarchive-c python3-termcolor bsdextrautils opengnsys-pyblkid ntfs-3g-system-compression python3-tqdm
- 
+
-- 
2.40.1


From 76950c8c11e25133a8c560ca5701af34b5abebf1 Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Mon, 17 Feb 2025 08:53:25 +0100
Subject: [PATCH 11/19] Launch browser with new wrapper

---
 includes/opt/opengnsys/etc/init/default.sh | 43 +++++++++++++
 includes/usr/bin/browser                   | 17 -----
 includes/usr/bin/launch_browser            | 72 ++++++++++++++++++++++
 3 files changed, 115 insertions(+), 17 deletions(-)
 create mode 100755 includes/opt/opengnsys/etc/init/default.sh
 delete mode 100644 includes/usr/bin/browser
 create mode 100644 includes/usr/bin/launch_browser

diff --git a/includes/opt/opengnsys/etc/init/default.sh b/includes/opt/opengnsys/etc/init/default.sh
new file mode 100755
index 0000000..a9073d4
--- /dev/null
+++ b/includes/opt/opengnsys/etc/init/default.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+# Proceso general de arranque de OpenGnsys Client.
+
+
+# Fichero de registro de incidencias (en el servidor; si no, en local).
+OPENGNSYS=${OPENGNSYS:-/opt/opengnsys}
+OGLOGFILE=${OGLOGFILE:-$OPENGNSYS/log/$(ogGetIpAdderss).log}
+if ! touch $OGLOGFILE 2>/dev/null; then
+    OGLOGFILE=/var/log/opengnsys.log
+fi
+LOGLEVEL=5
+
+# Matando plymount para inicir browser o shell
+pkill -9 plymouthd
+
+# Arranque de OpenGnsys Client daemon (socket).
+echo "${MSG_LAUNCHCLIENT:-.}"
+# 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"
+
+if [ "$ogstatus" != "offline"  ]; then
+    GROUP_CONFIG=/opt/opengnsys/ogClient/cfg/${group/ /_}.json
+    PYMAJMIN=`python3 --version | cut -d" " -f2 | cut -d. -f1,2`
+    export PYTHONPATH=/opt/opengnsys/lib/python$PYMAJMIN
+    if [ -f $GROUP_CONFIG ]; then
+        /opt/opengnsys/ogClient/./ogclient -c $GROUP_CONFIG
+    else
+        /opt/opengnsys/ogClient/./ogclient
+    fi
+else
+    for FILE in index $OGGROUP $(ogGetIpAddress)
+    do
+	[ -f $OGCAC/menus/$FILE.html ] && OGMENU="$OGCAC/menus/$FILE.html"
+    done
+    $OPENGNSYS/bin/launch_browser
+fi
+
+# Si fallo en cliente y modo "admin", cargar shell; si no, salir.
+if [ "$ogactiveadmin" == "true" ]; then
+    bash
+fi
+
+
diff --git a/includes/usr/bin/browser b/includes/usr/bin/browser
deleted file mode 100644
index b437bed..0000000
--- a/includes/usr/bin/browser
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# argumentos $0 -qws url
-ignored_args="$1"
-url="$2"
-
-
-mkdir -p $HOME/.config/sway
-echo "exec OGBrowser $url" > $HOME/.config/sway/config
-
-mkdir -p $HOME/.config/i3
-echo "exec OGBrowser $url" > $HOME/.config/i3/config
-echo "exec i3" > $HOME/.xinitrc
-
-sway || startx
-
-
diff --git a/includes/usr/bin/launch_browser b/includes/usr/bin/launch_browser
new file mode 100644
index 0000000..825efe3
--- /dev/null
+++ b/includes/usr/bin/launch_browser
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+# Compatibilidad con los argumentos usados con el browser original:
+# browser -qws http://google.com
+#
+while getopts ":qws" opt ; do
+case $opt in
+    q)
+        echo "Ignoring option: -q"
+        ;;
+    w)
+        echo "Ignoring option: -w"
+        ;;
+    s)
+        echo "Ignoring option: -s"
+        ;;
+    esac
+done
+
+shift $(expr $OPTIND - 1 )
+
+url="$1"
+
+echo "URL: $url"
+
+
+rm -rf "/run/sway.started" "/run/x11.started"
+
+
+mkdir -p $HOME/.config/sway
+echo "exec /usr/bin/OGBrowser $url" > $HOME/.config/sway/config
+echo "exec touch /run/sway.started" >> $HOME/.config/sway/config
+
+
+mkdir -p $HOME/.config/i3
+echo "exec OGBrowser $url" > $HOME/.config/i3/configc
+echo "exec touch /run/x11.started" >> $HOME/.config/i3/config
+
+echo "exec /usr/bin/i3"    > $HOME/.xinitrc
+echo "exec /usr/bin/xterm" >> $HOME/.xinitrc
+
+
+# Make sure libinput works
+/usr/bin/udevadm trigger
+
+
+if [ -x "/usr/bin/sway" ] ; then
+    echo "*** Trying to launch Sway ***"
+    /usr/bin/sway
+else
+    echo Sway not installed in this image, skipping.
+fi
+
+if [ ! -f "/run/sway.started" ] ; then
+    if [ -x "/usr/bin/startx" ] ; then
+        echo "*** Trying to launch X11 ***"
+        /usr/bin/startx
+    else
+        echo X11 not installed in this image, skipping.
+    fi
+else
+    echo "Sway was run before, not starting X11".
+fi
+
+if [ ! -f "/run/sway.started" -a ! -f "/run/x11.started" ] ; then
+    echo "Everything failed, dropping into a shell."
+    exec /usr/bin/bash
+else
+    echo "All done."
+fi
+
+
-- 
2.40.1


From 4d60aaa1d4547ed78a6b76e7da5e9949c840657b Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Tue, 18 Feb 2025 09:08:44 +0100
Subject: [PATCH 12/19] Improved browser launcher

---
 includes/usr/bin/launch_browser | 63 +++++++++++++++++++++++++++------
 1 file changed, 53 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 includes/usr/bin/launch_browser

diff --git a/includes/usr/bin/launch_browser b/includes/usr/bin/launch_browser
old mode 100644
new mode 100755
index 825efe3..654b411
--- a/includes/usr/bin/launch_browser
+++ b/includes/usr/bin/launch_browser
@@ -3,7 +3,7 @@
 # Compatibilidad con los argumentos usados con el browser original:
 # browser -qws http://google.com
 #
-while getopts ":qws" opt ; do
+while getopts ":qwsDWX" opt ; do
 case $opt in
     q)
         echo "Ignoring option: -q"
@@ -14,27 +14,70 @@ case $opt in
     s)
         echo "Ignoring option: -s"
         ;;
+    D)
+        BROWSER_DEBUG=1
+        ;;
+    W)
+        DISABLE_WAYLAND=1
+        ;;
+    X)
+        DISABLE_X11=1
+        ;;
     esac
 done
 
 shift $(expr $OPTIND - 1 )
 
-url="$1"
+browser_args="$@"
 
-echo "URL: $url"
+echo "Browser args: $browser_args"
+
+[ -n "$DISABLE_WAYLAND" ] && echo "WAYLAND DISABLED"
+[ -n "$DISABLE_X11"     ] && echo "X11 DISABLED"
+
+if [ -n "BROWSER_DEBUG" ] ; then
+    echo "DEBUG MODE ENABLED"
+    echo "* Terminal available via Win+Enter"
+    echo "* Session may be killed with Ctrl+Alt+Backspace"
+    echo ""
+fi
+
+
+
+[ -x "/usr/bin/kitty" ] && wl_terminal=/usr/bin/kitty
+[ -x "/usr/bin/foot" ]  && wl_terminal=/usr/bin/foot
+
+[ -x "/usr/bin/xterm" ]                 && x11_terminal=/usr/bin/kitty
+[ -x "/usr/bin/i3-sensible-terminal" ]  && x11_terminal=/usr/bin/i3-sensible-terminal
+
+# The admin page is hosted remotely but executes things on localhost
+QTWEBENGINE_CHROMIUM_FLAGS="--disable-web-security"
+
+[ "$UID" -eq "0" ] && QTWEBENGINE_CHROMIUM_FLAGS="${QTWEBENGINE_CHROMIUM_FLAGS} --no-sandbox"
 
 
 rm -rf "/run/sway.started" "/run/x11.started"
 
-
 mkdir -p $HOME/.config/sway
-echo "exec /usr/bin/OGBrowser $url" > $HOME/.config/sway/config
-echo "exec touch /run/sway.started" >> $HOME/.config/sway/config
+echo "exec /usr/bin/OGBrowser \"$browser_args\" || /usr/bin/browser -qws \"$browser_args\"" > $HOME/.config/sway/config
+
+if [ -n "BROWSER_DEBUG" ] ; then
+    echo "bindsym Mod4+Return exec $wl_terminal"  >> $HOME/.config/sway/config
+    echo "bindsym Control+Alt+Backspace exit"     >> $HOME/.config/sway/config
+fi
+
+echo "exec touch /run/sway.started"     >> $HOME/.config/sway/config
 
 
 mkdir -p $HOME/.config/i3
-echo "exec OGBrowser $url" > $HOME/.config/i3/configc
-echo "exec touch /run/x11.started" >> $HOME/.config/i3/config
+echo "exec /usr/bin/OGBrowser \"$browser_args\" || /usr/bin/browser -qws \"$browser_args\"" > $HOME/.config/i3/config
+
+if [ -n "BROWSER_DEBUG" ] ; then
+    echo "bindsym Mod4+Return exec i3-sensible-terminal"  >> $HOME/.config/i3/config
+    echo "bindsym Control+Mod1+BackSpace exit"                >> $HOME/.config/i3/config
+fi
+
+echo "exec touch /run/x11.started"                    >> $HOME/.config/i3/config
 
 echo "exec /usr/bin/i3"    > $HOME/.xinitrc
 echo "exec /usr/bin/xterm" >> $HOME/.xinitrc
@@ -44,14 +87,14 @@ echo "exec /usr/bin/xterm" >> $HOME/.xinitrc
 /usr/bin/udevadm trigger
 
 
-if [ -x "/usr/bin/sway" ] ; then
+if [ -x "/usr/bin/sway" -a -z "$DISABLE_WAYLAND" ] ; then
     echo "*** Trying to launch Sway ***"
     /usr/bin/sway
 else
     echo Sway not installed in this image, skipping.
 fi
 
-if [ ! -f "/run/sway.started" ] ; then
+if [ ! -f "/run/sway.started" -a -z "$DISABLE_X11" ] ; then
     if [ -x "/usr/bin/startx" ] ; then
         echo "*** Trying to launch X11 ***"
         /usr/bin/startx
-- 
2.40.1


From 0cc540c0cd25c297771e3ecec539c820a70d2006 Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Tue, 18 Feb 2025 09:57:35 +0100
Subject: [PATCH 13/19] test

---
 includes/usr/bin/launch_browser | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/usr/bin/launch_browser b/includes/usr/bin/launch_browser
index 654b411..6e026bb 100755
--- a/includes/usr/bin/launch_browser
+++ b/includes/usr/bin/launch_browser
@@ -74,7 +74,7 @@ echo "exec /usr/bin/OGBrowser \"$browser_args\" || /usr/bin/browser -qws \"$brow
 
 if [ -n "BROWSER_DEBUG" ] ; then
     echo "bindsym Mod4+Return exec i3-sensible-terminal"  >> $HOME/.config/i3/config
-    echo "bindsym Control+Mod1+BackSpace exit"                >> $HOME/.config/i3/config
+    echo "bindsym Control+Mod1+BackSpace exit"            >> $HOME/.config/i3/config
 fi
 
 echo "exec touch /run/x11.started"                    >> $HOME/.config/i3/config
-- 
2.40.1


From 2c97f724853cd2b2ee85438cb60640ec01a5541e Mon Sep 17 00:00:00 2001
From: Vadim Troshchinskiy <vtroshchinskiy@qindel.com>
Date: Tue, 18 Feb 2025 15:53:21 +0100
Subject: [PATCH 14/19] Export variable

---
 includes/usr/bin/launch_browser | 1 +
 1 file changed, 1 insertion(+)

diff --git a/includes/usr/bin/launch_browser b/includes/usr/bin/launch_browser
index 6e026bb..d0d6780 100755
--- a/includes/usr/bin/launch_browser
+++ b/includes/usr/bin/launch_browser
@@ -55,6 +55,7 @@ QTWEBENGINE_CHROMIUM_FLAGS="--disable-web-security"
 
 [ "$UID" -eq "0" ] && QTWEBENGINE_CHROMIUM_FLAGS="${QTWEBENGINE_CHROMIUM_FLAGS} --no-sandbox"
 
+export QTWEBENGINE_CHROMIUM_FLAGS
 
 rm -rf "/run/sway.started" "/run/x11.started"
 
-- 
2.40.1


From 1029ad0fe6af97f7be4e5832195494dfdcfe9251 Mon Sep 17 00:00:00 2001
From: Vadim Trochinsky <git@vadim.ws>
Date: Thu, 27 Feb 2025 10:05:05 +0100
Subject: [PATCH 15/19] Re-add ignore-ssl flag

---
 includes/usr/bin/launch_browser | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/usr/bin/launch_browser b/includes/usr/bin/launch_browser
index d0d6780..b207ba2 100755
--- a/includes/usr/bin/launch_browser
+++ b/includes/usr/bin/launch_browser
@@ -60,7 +60,7 @@ export QTWEBENGINE_CHROMIUM_FLAGS
 rm -rf "/run/sway.started" "/run/x11.started"
 
 mkdir -p $HOME/.config/sway
-echo "exec /usr/bin/OGBrowser \"$browser_args\" || /usr/bin/browser -qws \"$browser_args\"" > $HOME/.config/sway/config
+echo "exec /usr/bin/OGBrowser --ignore-ssl-errors \"$browser_args\" || /usr/bin/browser -qws \"$browser_args\"" > $HOME/.config/sway/config
 
 if [ -n "BROWSER_DEBUG" ] ; then
     echo "bindsym Mod4+Return exec $wl_terminal"  >> $HOME/.config/sway/config
@@ -71,7 +71,7 @@ echo "exec touch /run/sway.started"     >> $HOME/.config/sway/config
 
 
 mkdir -p $HOME/.config/i3
-echo "exec /usr/bin/OGBrowser \"$browser_args\" || /usr/bin/browser -qws \"$browser_args\"" > $HOME/.config/i3/config
+echo "exec /usr/bin/OGBrowser --ignore-ssl-errors \"$browser_args\" || /usr/bin/browser -qws \"$browser_args\"" > $HOME/.config/i3/config
 
 if [ -n "BROWSER_DEBUG" ] ; then
     echo "bindsym Mod4+Return exec i3-sensible-terminal"  >> $HOME/.config/i3/config
-- 
2.40.1


From 6d74a02d25a25a1054da7a5a9aba802bfc0dbf55 Mon Sep 17 00:00:00 2001
From: Vadim Trochinsky <git@vadim.ws>
Date: Thu, 27 Feb 2025 10:16:32 +0100
Subject: [PATCH 16/19] Add browser package to list

---
 mkoglive.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkoglive.cfg b/mkoglive.cfg
index 29ec24f..2183d0d 100644
--- a/mkoglive.cfg
+++ b/mkoglive.cfg
@@ -131,7 +131,7 @@ xwindows =
   #roxterm gparted       #+80M
   #openbox midori        #xvesa en compilacion
 
-ogbrowser = sway libinput-tools hwdata
+ogbrowser = sway libinput-tools hwdata OGBrowser
 
 oggit = python3 python3-git python3-pyxattr python3-libarchive-c python3-pylibacl python3-pip opengnsys-libarchive-c python3-termcolor bsdextrautils opengnsys-pyblkid ntfs-3g-system-compression python3-tqdm
 
-- 
2.40.1


From 0b2bb981725e39684b07e508257cc21a4954f349 Mon Sep 17 00:00:00 2001
From: Vadim Trochinsky <git@vadim.ws>
Date: Thu, 27 Feb 2025 12:07:25 +0100
Subject: [PATCH 17/19] browser

---
 mkoglive.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkoglive.cfg b/mkoglive.cfg
index 2183d0d..8c7976f 100644
--- a/mkoglive.cfg
+++ b/mkoglive.cfg
@@ -131,7 +131,7 @@ xwindows =
   #roxterm gparted       #+80M
   #openbox midori        #xvesa en compilacion
 
-ogbrowser = sway libinput-tools hwdata OGBrowser
+ogbrowser = sway libinput-tools hwdata ogbrowser
 
 oggit = python3 python3-git python3-pyxattr python3-libarchive-c python3-pylibacl python3-pip opengnsys-libarchive-c python3-termcolor bsdextrautils opengnsys-pyblkid ntfs-3g-system-compression python3-tqdm
 
-- 
2.40.1


From f9bb2f3868b9ab167e7eb943d36f2833febf79ff Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Wed, 14 May 2025 13:07:43 +0200
Subject: [PATCH 18/19] refs #2000 remove included file--it lives elsewhere

---
 includes/opt/opengnsys/etc/init/default.sh | 43 ----------------------
 1 file changed, 43 deletions(-)
 delete mode 100755 includes/opt/opengnsys/etc/init/default.sh

diff --git a/includes/opt/opengnsys/etc/init/default.sh b/includes/opt/opengnsys/etc/init/default.sh
deleted file mode 100755
index a9073d4..0000000
--- a/includes/opt/opengnsys/etc/init/default.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-# Proceso general de arranque de OpenGnsys Client.
-
-
-# Fichero de registro de incidencias (en el servidor; si no, en local).
-OPENGNSYS=${OPENGNSYS:-/opt/opengnsys}
-OGLOGFILE=${OGLOGFILE:-$OPENGNSYS/log/$(ogGetIpAdderss).log}
-if ! touch $OGLOGFILE 2>/dev/null; then
-    OGLOGFILE=/var/log/opengnsys.log
-fi
-LOGLEVEL=5
-
-# Matando plymount para inicir browser o shell
-pkill -9 plymouthd
-
-# Arranque de OpenGnsys Client daemon (socket).
-echo "${MSG_LAUNCHCLIENT:-.}"
-# 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"
-
-if [ "$ogstatus" != "offline"  ]; then
-    GROUP_CONFIG=/opt/opengnsys/ogClient/cfg/${group/ /_}.json
-    PYMAJMIN=`python3 --version | cut -d" " -f2 | cut -d. -f1,2`
-    export PYTHONPATH=/opt/opengnsys/lib/python$PYMAJMIN
-    if [ -f $GROUP_CONFIG ]; then
-        /opt/opengnsys/ogClient/./ogclient -c $GROUP_CONFIG
-    else
-        /opt/opengnsys/ogClient/./ogclient
-    fi
-else
-    for FILE in index $OGGROUP $(ogGetIpAddress)
-    do
-	[ -f $OGCAC/menus/$FILE.html ] && OGMENU="$OGCAC/menus/$FILE.html"
-    done
-    $OPENGNSYS/bin/launch_browser
-fi
-
-# Si fallo en cliente y modo "admin", cargar shell; si no, salir.
-if [ "$ogactiveadmin" == "true" ]; then
-    bash
-fi
-
-
-- 
2.40.1


From 895131bb057c58b680219739cfe2acdd7af35220 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Wed, 14 May 2025 14:49:02 +0200
Subject: [PATCH 19/19] refs #2000 bump version

---
 CHANGELOG.md                                     | 6 ++++++
 includes/etc/initramfs-tools/scripts/VERSION.txt | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1276701..9078439 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.3.0] - 2025-05-14
+
+### Changed
+
+- Add changes required for the new browser
+
 ## [3.2.1] - 2025-03-31
 
 ### Changed
diff --git a/includes/etc/initramfs-tools/scripts/VERSION.txt b/includes/etc/initramfs-tools/scripts/VERSION.txt
index 432131a..fac038b 100644
--- a/includes/etc/initramfs-tools/scripts/VERSION.txt
+++ b/includes/etc/initramfs-tools/scripts/VERSION.txt
@@ -1 +1 @@
-OpenGnsys Client 3.2.1
+OpenGnsys Client 3.3.0
-- 
2.40.1