From fe39c2d99fd7b08c834c139ced04a6b146570d58 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Wed, 23 Oct 2024 17:51:22 +0200
Subject: [PATCH 01/32] refs #953 do this change in a higher-level place, and
 use an underscore

---
 boottools/btog.py | 11 +++++------
 mkoglive.py       |  4 +++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/boottools/btog.py b/boottools/btog.py
index 87e48d0..3b4ded1 100644
--- a/boottools/btog.py
+++ b/boottools/btog.py
@@ -365,17 +365,16 @@ def mkisofs (pxepkg, isolinux_tpl, bttargetdir, nameisoclient):
     #el ogclienteToISO  debe tener una copia del ogvmlinuz como linuxISO
     #cp -prv /var/lib/tftpboot/ogclientToIso/* /tmp/iso/ogclient
 
-    today = datetime.datetime.now(datetime.timezone.utc).strftime ('%Y%m%d')
     oldpwd = os.getcwd()
     os.chdir ('/tmp')
-    logger.debug (f'mkisofs -quiet -V ogClient -o {nameisoclient}-{today}.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -J -no-emul-boot -boot-load-size 4 -boot-info-table /tmp/iso')
-    utils.run (['mkisofs', '-quiet', '-V', 'ogClient', '-o', f'{nameisoclient}-{today}.iso', '-b', 'isolinux/isolinux.bin', '-c', 'isolinux/boot.cat', '-J', '-no-emul-boot', '-boot-load-size', '4', '-boot-info-table', '/tmp/iso'])
+    logger.debug (f'mkisofs -quiet -V ogClient -o {nameisoclient}.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -J -no-emul-boot -boot-load-size 4 -boot-info-table /tmp/iso')
+    utils.run (['mkisofs', '-quiet', '-V', 'ogClient', '-o', f'{nameisoclient}.iso', '-b', 'isolinux/isolinux.bin', '-c', 'isolinux/boot.cat', '-J', '-no-emul-boot', '-boot-load-size', '4', '-boot-info-table', '/tmp/iso'])
 
-    utils.write_md5 (f'{nameisoclient}-{today}.iso')
+    utils.write_md5 (f'{nameisoclient}.iso')
     os.chdir (oldpwd)
 
-    shutil.move (f'/tmp/{nameisoclient}-{today}.iso'    , f'/var/lib/tftpboot/ogclient/{nameisoclient}-{today}.iso')
-    shutil.move (f'/tmp/{nameisoclient}-{today}.iso.sum', f'/var/lib/tftpboot/ogclient/{nameisoclient}-{today}.iso.sum')
+    shutil.move (f'/tmp/{nameisoclient}.iso'    , f'/var/lib/tftpboot/ogclient/{nameisoclient}.iso')
+    shutil.move (f'/tmp/{nameisoclient}.iso.sum', f'/var/lib/tftpboot/ogclient/{nameisoclient}.iso.sum')
 
 #def __unused_boottoolsBootGraphics():
 #    find /tmp/opengnsys_installer/ -name .svn -type d -exec rm -fr {} \; 2>/dev/null;
diff --git a/mkoglive.py b/mkoglive.py
index 79f369a..72d04db 100755
--- a/mkoglive.py
+++ b/mkoglive.py
@@ -8,6 +8,7 @@ import glob
 import stat
 import shutil
 import argparse
+import datetime
 
 curdir = os.path.dirname (__file__)
 sys.path.insert (0, curdir)
@@ -144,7 +145,8 @@ def _main (cfgfile, config, type_client):
 
     logger.info ('STAGE 4 - generate distribution files')
     pxepkg = _get_pxepkg()
-    nameisoclient  = '-'.join (['ogLive', oscodename, osrelease, osarch, gitrelease])
+    today = datetime.datetime.now(datetime.timezone.utc).strftime ('%Y%m%d')
+    nameisoclient  = '-'.join (['ogLive', oscodename, osrelease, osarch, gitrelease+'_'+today])
     _mkinitrd_squashfs_isofs (bttargetdir, osrelease, btrootfsimg, btrootfsmnt, pxepkg, isolinux_tpl, nameisoclient)
 
     logger.info ('OpenGnsys installation finished')

From c1a9ff29b711a458d588656521fb397ed564f820 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Thu, 24 Oct 2024 11:55:52 +0200
Subject: [PATCH 02/32] refs #809 install packages and a pip module, try to
 invalidate docker cache at a specific point

---
 Dockerfile      | 9 ++++++---
 chroot-tasks.py | 4 ++++
 mkoglive.cfg    | 4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1c4e92a..e6367cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,5 @@
 FROM ubuntu:noble
 
-ARG OPENGNSYS_BRANCH=main
-
 RUN apt-get update && apt-get -y install \
   debootstrap \
   fdisk \
@@ -27,14 +25,19 @@ RUN groupadd opengnsys
 RUN mkdir -p /opt/opengnsys/client /tmp/opengnsys/oglive_builder /var/lib/tftpboot/
 RUN ln -fs /var/lib/tftpboot /opt/opengnsys
 
+ARG OPENGNSYS_BRANCH=main
+
 ## take stuff from the OG repo: a) cloning engine, b) shared stuff and c) gitrelease
 RUN git clone -c http.sslVerify=false --branch ${OPENGNSYS_BRANCH} https://ognproject.evlt.uma.es/gitea/opengnsys/opengnsys.git /tmp/ogrepo && \
+    git --git-dir /tmp/ogrepo/.git rev-parse ${OPENGNSYS_BRANCH} && \
     mv /tmp/ogrepo/client/engine /tmp/ogrepo/client/shared /tmp/opengnsys/ && \
     git --git-dir /tmp/ogrepo/.git log --date format:r%Y%m%d --format=%ad -1 >/tmp/opengnsys/oglive_builder/gitrelease && \
     rm -rf /tmp/ogrepo/
 
 ## if we place the ogagent.deb and the ogbrowser.deb in the cwd, then this 'COPY .' copies them to the image
 COPY . /tmp/opengnsys/oglive_builder/
-RUN cp /tmp/opengnsys/oglive_builder/schroot.conf /tmp/opengnsys/oglive_builder/mount-defaults /etc/schroot/ && echo '' >/etc/schroot/default/nssdatabases && rm -f /etc/schroot/setup.d/*chrootname
+RUN cp /tmp/opengnsys/oglive_builder/schroot.conf /tmp/opengnsys/oglive_builder/mount-defaults /etc/schroot/ && \
+    echo '' >/etc/schroot/default/nssdatabases && \
+    rm -f /etc/schroot/setup.d/*chrootname
 
 ENTRYPOINT ["/tmp/opengnsys/oglive_builder/mkoglive.py"]
diff --git a/chroot-tasks.py b/chroot-tasks.py
index ab80ae0..3d422e5 100755
--- a/chroot-tasks.py
+++ b/chroot-tasks.py
@@ -102,6 +102,9 @@ def boottoolsSoftwareCompile():
     os.environ['LC_ALL']   = env_lc_all
     os.environ['LANG']     = env_lang
 
+def boottoolsPythonModules():
+    utils.run (['pip3', 'install', 'pyblkid'])
+
 def boottoolsInitrdGenerate (osrelease):
     print ('boottoolsInitrdGenerate', file=sys.stderr)
     for f in glob.glob ('/usr/lib/initramfs-tools/bin/*'):
@@ -139,4 +142,5 @@ if __name__ == '__main__':
 
     boottoolsSoftwareInstall (args.osarch, args.osrelease)
     boottoolsSoftwareCompile()
+    boottoolsPythonModules()
     boottoolsInitrdGenerate (args.osrelease)
diff --git a/mkoglive.cfg b/mkoglive.cfg
index ba97641..bd0fe9e 100644
--- a/mkoglive.cfg
+++ b/mkoglive.cfg
@@ -68,8 +68,6 @@ isolinux_template =
 
 [Packages]
 
-agent = policykit-1 python3 python3-pyqt6 python3-requests python3-six python3-prctl python3-distro libxss1 zenity
-
 basic =
   dialog man-db fbset gdebi-core bash-static busybox-static locales lshw gawk git python3-openssl python3 php-cli dmidecode rpm sqlite3 os-prober moreutils jq
   #console-data  # ogLive anterior a Ubuntu 20.04
@@ -131,3 +129,5 @@ xwindows =
   #xorg-dev xorg lxde    #+300M
   #roxterm gparted       #+80M
   #openbox midori        #xvesa en compilacion
+
+oggit = python3 python3-git python3-xattr python3-libarchive-c python3-pylibacl

From 1f695da3e4d96227e562f485b526d1889c7a4bb1 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Thu, 24 Oct 2024 12:13:26 +0200
Subject: [PATCH 03/32] refs #809 try to invalidate docker cache at a specific
 point

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e6367cd..4f025b5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,7 @@ ARG OPENGNSYS_BRANCH=main
 
 ## take stuff from the OG repo: a) cloning engine, b) shared stuff and c) gitrelease
 RUN git clone -c http.sslVerify=false --branch ${OPENGNSYS_BRANCH} https://ognproject.evlt.uma.es/gitea/opengnsys/opengnsys.git /tmp/ogrepo && \
-    git --git-dir /tmp/ogrepo/.git rev-parse ${OPENGNSYS_BRANCH} && \
+    git --git-dir /tmp/ogrepo/.git rev-parse HEAD && \
     mv /tmp/ogrepo/client/engine /tmp/ogrepo/client/shared /tmp/opengnsys/ && \
     git --git-dir /tmp/ogrepo/.git log --date format:r%Y%m%d --format=%ad -1 >/tmp/opengnsys/oglive_builder/gitrelease && \
     rm -rf /tmp/ogrepo/

From dffb315879b7e31484e4005cb3201e5105ad996c Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Thu, 24 Oct 2024 21:50:46 +0200
Subject: [PATCH 04/32] refs #809 try to invalidate docker cache at a specific
 point

---
 Dockerfile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4f025b5..29c0feb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,14 +25,10 @@ RUN groupadd opengnsys
 RUN mkdir -p /opt/opengnsys/client /tmp/opengnsys/oglive_builder /var/lib/tftpboot/
 RUN ln -fs /var/lib/tftpboot /opt/opengnsys
 
-ARG OPENGNSYS_BRANCH=main
-
 ## take stuff from the OG repo: a) cloning engine, b) shared stuff and c) gitrelease
-RUN git clone -c http.sslVerify=false --branch ${OPENGNSYS_BRANCH} https://ognproject.evlt.uma.es/gitea/opengnsys/opengnsys.git /tmp/ogrepo && \
-    git --git-dir /tmp/ogrepo/.git rev-parse HEAD && \
-    mv /tmp/ogrepo/client/engine /tmp/ogrepo/client/shared /tmp/opengnsys/ && \
-    git --git-dir /tmp/ogrepo/.git log --date format:r%Y%m%d --format=%ad -1 >/tmp/opengnsys/oglive_builder/gitrelease && \
-    rm -rf /tmp/ogrepo/
+RUN git --git-dir ./opengnsys/.git rev-parse HEAD && \
+    mv ./opengnsys/client/engine ./opengnsys/client/shared /tmp/opengnsys/ && \
+    git --git-dir ./opengnsys/.git log --date format:r%Y%m%d --format=%ad -1 >/tmp/opengnsys/oglive_builder/gitrelease
 
 ## if we place the ogagent.deb and the ogbrowser.deb in the cwd, then this 'COPY .' copies them to the image
 COPY . /tmp/opengnsys/oglive_builder/

From 02b44a1d950072d1bca35b7a656a9f3e64825d14 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Thu, 24 Oct 2024 22:16:44 +0200
Subject: [PATCH 05/32] refs #809 collaborate with the jenkins job

---
 Dockerfile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 29c0feb..cd8cd5e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,14 +25,14 @@ RUN groupadd opengnsys
 RUN mkdir -p /opt/opengnsys/client /tmp/opengnsys/oglive_builder /var/lib/tftpboot/
 RUN ln -fs /var/lib/tftpboot /opt/opengnsys
 
-## take stuff from the OG repo: a) cloning engine, b) shared stuff and c) gitrelease
-RUN git --git-dir ./opengnsys/.git rev-parse HEAD && \
-    mv ./opengnsys/client/engine ./opengnsys/client/shared /tmp/opengnsys/ && \
-    git --git-dir ./opengnsys/.git log --date format:r%Y%m%d --format=%ad -1 >/tmp/opengnsys/oglive_builder/gitrelease
+ARG OPENGNSYS_HEAD
 
-## if we place the ogagent.deb and the ogbrowser.deb in the cwd, then this 'COPY .' copies them to the image
-COPY . /tmp/opengnsys/oglive_builder/
-RUN cp /tmp/opengnsys/oglive_builder/schroot.conf /tmp/opengnsys/oglive_builder/mount-defaults /etc/schroot/ && \
+COPY ./og_client_engine /tmp/opengnsys/engine
+COPY ./og_client_shared /tmp/opengnsys/shared
+COPY ./gitrelease       /tmp/opengnsys/
+COPY ./*.deb            /tmp/opengnsys/oglive_builder/
+RUN ls -la /tmp/opengnsys/ /tmp/opengnsys/engine/ /tmp/opengnsys/shared/ /tmp/opengnsys/oglive_builder/ && \
+    cp /tmp/opengnsys/oglive_builder/schroot.conf /tmp/opengnsys/oglive_builder/mount-defaults /etc/schroot/ && \
     echo '' >/etc/schroot/default/nssdatabases && \
     rm -f /etc/schroot/setup.d/*chrootname
 

From 6b664246318104ae28f54747a67b17dcc1ff9aaa Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Thu, 24 Oct 2024 22:28:19 +0200
Subject: [PATCH 06/32] refs #809 collaborate with the jenkins job

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index cd8cd5e..fde9b2e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,8 @@ ARG OPENGNSYS_HEAD
 COPY ./og_client_engine /tmp/opengnsys/engine
 COPY ./og_client_shared /tmp/opengnsys/shared
 COPY ./gitrelease       /tmp/opengnsys/
-COPY ./*.deb            /tmp/opengnsys/oglive_builder/
+COPY *.deb boottools includes chroot-tasks.py mkoglive.cfg mkoglive.py mount-defaults schroot.conf /tmp/opengnsys/oglive_builder/
+
 RUN ls -la /tmp/opengnsys/ /tmp/opengnsys/engine/ /tmp/opengnsys/shared/ /tmp/opengnsys/oglive_builder/ && \
     cp /tmp/opengnsys/oglive_builder/schroot.conf /tmp/opengnsys/oglive_builder/mount-defaults /etc/schroot/ && \
     echo '' >/etc/schroot/default/nssdatabases && \

From 567c8dcfb5f741e10eab544555a6dd12938365dd Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Thu, 24 Oct 2024 22:40:23 +0200
Subject: [PATCH 07/32] refs #809 collaborate with the jenkins job

---
 Dockerfile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fde9b2e..e7cfcca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,12 +27,10 @@ RUN ln -fs /var/lib/tftpboot /opt/opengnsys
 
 ARG OPENGNSYS_HEAD
 
-COPY ./og_client_engine /tmp/opengnsys/engine
-COPY ./og_client_shared /tmp/opengnsys/shared
-COPY ./gitrelease       /tmp/opengnsys/
-COPY *.deb boottools includes chroot-tasks.py mkoglive.cfg mkoglive.py mount-defaults schroot.conf /tmp/opengnsys/oglive_builder/
+COPY . /tmp/opengnsys/oglive_builder/
 
-RUN ls -la /tmp/opengnsys/ /tmp/opengnsys/engine/ /tmp/opengnsys/shared/ /tmp/opengnsys/oglive_builder/ && \
+RUN ls -la /tmp/opengnsys/oglive_builder/ && \
+    mv /tmp/opengnsys/oglive_builder/client /tmp/opengnsys/oglive_builder/shared /tmp/opengnsys/ && \
     cp /tmp/opengnsys/oglive_builder/schroot.conf /tmp/opengnsys/oglive_builder/mount-defaults /etc/schroot/ && \
     echo '' >/etc/schroot/default/nssdatabases && \
     rm -f /etc/schroot/setup.d/*chrootname

From 7123d35179a7602aaeba2b77cb7c4d3c254cc6b9 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Thu, 24 Oct 2024 22:45:32 +0200
Subject: [PATCH 08/32] refs #809 collaborate with the jenkins job

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e7cfcca..0caba67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,7 @@ ARG OPENGNSYS_HEAD
 COPY . /tmp/opengnsys/oglive_builder/
 
 RUN ls -la /tmp/opengnsys/oglive_builder/ && \
-    mv /tmp/opengnsys/oglive_builder/client /tmp/opengnsys/oglive_builder/shared /tmp/opengnsys/ && \
+    mv /tmp/opengnsys/oglive_builder/engine /tmp/opengnsys/oglive_builder/shared /tmp/opengnsys/ && \
     cp /tmp/opengnsys/oglive_builder/schroot.conf /tmp/opengnsys/oglive_builder/mount-defaults /etc/schroot/ && \
     echo '' >/etc/schroot/default/nssdatabases && \
     rm -f /etc/schroot/setup.d/*chrootname

From fe5645c30a5598dd7a82544a9e3348f379950d76 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Thu, 24 Oct 2024 22:50:55 +0200
Subject: [PATCH 09/32] refs #809 install pip

---
 .dockerignore | 3 +++
 mkoglive.cfg  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.dockerignore b/.dockerignore
index a66a176..01ed5e6 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -10,3 +10,6 @@ ogclient/
 ogclientImg2Sqfs
 ogclientSqfs2Img
 **/*.swp
+
+## the following is used in the jenkins job
+opengnsys-repo
diff --git a/mkoglive.cfg b/mkoglive.cfg
index bd0fe9e..ca7cbe0 100644
--- a/mkoglive.cfg
+++ b/mkoglive.cfg
@@ -130,4 +130,4 @@ xwindows =
   #roxterm gparted       #+80M
   #openbox midori        #xvesa en compilacion
 
-oggit = python3 python3-git python3-xattr python3-libarchive-c python3-pylibacl
+oggit = python3 python3-git python3-xattr python3-libarchive-c python3-pylibacl python3-pip

From 7467f991a60d47e695febbcba75fa4761c85dda4 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Thu, 24 Oct 2024 22:56:27 +0200
Subject: [PATCH 10/32] refs #809 clean packages up a bit later

---
 chroot-tasks.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/chroot-tasks.py b/chroot-tasks.py
index 3d422e5..4c10dd0 100755
--- a/chroot-tasks.py
+++ b/chroot-tasks.py
@@ -96,7 +96,6 @@ def boottoolsSoftwareCompile():
         os.chdir ('python-libfdisk')
         utils.run (['python3', 'setup.py', 'install'])
         os.chdir ('..')
-        apt.remove (['python3-dev', 'python3-setuptools'])
 
     os.environ['LANGUAGE'] = env_language
     os.environ['LC_ALL']   = env_lc_all
@@ -105,6 +104,9 @@ def boottoolsSoftwareCompile():
 def boottoolsPythonModules():
     utils.run (['pip3', 'install', 'pyblkid'])
 
+def boottoolsRemovePackages():
+    apt.remove (['python3-dev', 'python3-setuptools', 'python3-pip'])
+
 def boottoolsInitrdGenerate (osrelease):
     print ('boottoolsInitrdGenerate', file=sys.stderr)
     for f in glob.glob ('/usr/lib/initramfs-tools/bin/*'):
@@ -143,4 +145,5 @@ if __name__ == '__main__':
     boottoolsSoftwareInstall (args.osarch, args.osrelease)
     boottoolsSoftwareCompile()
     boottoolsPythonModules()
+    boottoolsRemovePackages()
     boottoolsInitrdGenerate (args.osrelease)

From 865470e03c70d5338f6f2d5fa1dfda3067be55b4 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Thu, 24 Oct 2024 23:01:47 +0200
Subject: [PATCH 11/32] refs #809 force pip to install things

---
 chroot-tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chroot-tasks.py b/chroot-tasks.py
index 4c10dd0..7a276b4 100755
--- a/chroot-tasks.py
+++ b/chroot-tasks.py
@@ -102,7 +102,7 @@ def boottoolsSoftwareCompile():
     os.environ['LANG']     = env_lang
 
 def boottoolsPythonModules():
-    utils.run (['pip3', 'install', 'pyblkid'])
+    utils.run (['pip3', 'install', 'pyblkid', '--break-system-packages'])
 
 def boottoolsRemovePackages():
     apt.remove (['python3-dev', 'python3-setuptools', 'python3-pip'])

From 0e5d83c501f2a7bbbe8d7fa05b4e947225183b13 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Fri, 25 Oct 2024 12:13:15 +0200
Subject: [PATCH 12/32] refs #809 bump version

---
 includes/etc/initramfs-tools/scripts/VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/etc/initramfs-tools/scripts/VERSION.txt b/includes/etc/initramfs-tools/scripts/VERSION.txt
index 31621f3..c7b3049 100644
--- a/includes/etc/initramfs-tools/scripts/VERSION.txt
+++ b/includes/etc/initramfs-tools/scripts/VERSION.txt
@@ -1 +1 @@
-OpenGnsys Client 1.2.0-rc1
+OpenGnsys Client 3.1.0

From 6dddc6ba8b1357684dacef1479882da4cb6664fa Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Fri, 15 Nov 2024 16:05:29 +0100
Subject: [PATCH 13/32] refs #809 debug init scripts

---
 .../etc/initramfs-tools/scripts/ogfunctions   | 20 ++++++++++++++++---
 includes/etc/initramfs-tools/scripts/oginit   |  4 ++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/includes/etc/initramfs-tools/scripts/ogfunctions b/includes/etc/initramfs-tools/scripts/ogfunctions
index 4d96f7e..26538ca 100644
--- a/includes/etc/initramfs-tools/scripts/ogfunctions
+++ b/includes/etc/initramfs-tools/scripts/ogfunctions
@@ -19,6 +19,7 @@
 #*/ ##
 ogGetNetworkDevice ()
 {
+echo "nati: in ogGetNetworkDevice()"
 # Mantener retrocompatibilidad con interfaces antiguas tipo eth.
 case "$1" in
 	eth0)	ind=1 ;;
@@ -26,12 +27,13 @@ case "$1" in
 	eth2)	ind=3 ;;
 	*)	ind="$1" ;;
 esac
+echo "nati: ind ($ind)"
 # Buscar el dispositivo del índice.
 dev=""
 for f in /sys/class/net/*/uevent; do
 	source $f
 	let aux=$IFINDEX-1
-	[ "$ind" = "$INTERFACE" -o "$ind" = $aux ] && dev="$INTERFACE"
+	if [ "$ind" = "$INTERFACE" -o "$ind" = $aux ]; then echo "nati: ind ($ind) == INTERFACE ($INTERFACE) -o ind ($ind) == aux ($aux), setting dev to ($INTERFACE)"; dev="$INTERFACE"; fi
 done
 [ -n "$dev" ] && echo "$dev"
 }
@@ -50,18 +52,28 @@ done
 #*/ ##
 ogExportKernelParameters ()
 {
+    echo "nati: in ogExportKernelParameters()"
 	GLOBAL="cat /proc/cmdline"
 	for i in `${GLOBAL}`
 	do
-		echo $i | grep "=" > /dev/null && export $i
+        echo "nati: considering ($i)"
+		if echo $i | grep "=" > /dev/null; then
+            if echo $i | grep '\..*=' > /dev/null; then echo "nati: skipping ($i)"; continue; fi
+            echo "nati: exporting ($i)"
+            export $i
+        fi
 	done
 	# Sustituir índice de interfaz de red por su dispositivo.
 	DEVIND=$(echo "$ip" | cut -f6 -d:)
+    echo "nati: DEVIND ($DEVIND)"
 	if [ -n "$DEVIND" ]; then
 		PRE=$(echo "$ip" | cut -f1-5 -d:)
 		POST=$(echo "$ip" | cut -f7- -d:)
+        echo "nati: PRE ($PRE) POST ($POST)"
+        echo "nati: calling ogGetNetworkDevice()"
 		DEVICE=$(ogGetNetworkDevice $DEVIND)
-		[ -n "$DEVICE" ] && export ip="$PRE:$DEVICE:${POST:-none}"
+        echo "nati: got DEVICE ($DEVICE)"
+		[ -n "$DEVICE" ] && echo "nati: DEVICE is true, exporting ip ($PRE:$DEVICE:${POST:-none})" && export ip="$PRE:$DEVICE:${POST:-none}"
 	fi
 	return 0
 }
@@ -119,6 +131,7 @@ fi
 #*/ ##
 ogExportVarEnvironment ()
 {
+	echo "nati: in ogExportVarEnvironment"
 	export CFGINITRD="/tmp/initrd.cfg"	
 	OGPROTOCOL="${ogprotocol:-smb}"
 	[ "$ogunit" != "" ] && OGUNIT="/$ogunit"
@@ -178,6 +191,7 @@ ogExportVarEnvironment ()
 		#$OGSERVERSHARE
 		#$OGSERVERLOG
 		#$OGSERVERIMAGES
+	echo "nati: exiting ogExportVarEnvironment"
 	return 0
 }
 
diff --git a/includes/etc/initramfs-tools/scripts/oginit b/includes/etc/initramfs-tools/scripts/oginit
index 2c88fdc..381698f 100755
--- a/includes/etc/initramfs-tools/scripts/oginit
+++ b/includes/etc/initramfs-tools/scripts/oginit
@@ -54,14 +54,18 @@ mountroot ()
 
 	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before get OG variables: y/N "
     [ $? == 0 ] && sh || echo " "
+	echo "nati: Checking kernel parameters: calling ogExportKernelParameters"
 	set -a
 	log_success_msg "Checking kernel parameters"
 	ogExportKernelParameters 
 	# Cambiar resolución de vídeo para kernels que usan el parámetro "video".
+	echo "nati: calling ogChangeVideoResolution"
 	[ -n "$video" ] && ogChangeVideoResolution
+	echo "nati: Checking OpenGnsys Environmnet: calling ogExportVarEnvironment"
 	log_success_msg "Checking OpenGnsys Environmnet"
 	ogExportVarEnvironment
 	
+	echo "nati: stayin alive"
 	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before configure ramfs structure for OG: y/N "
     [ $? == 0 ] && sh || echo " "
 	ogConfigureRamfs

From a2e12e6b6e794f47b97f82920732f2816f747d7a Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Fri, 15 Nov 2024 16:47:31 +0100
Subject: [PATCH 14/32] refs #809 fix redir, change prefix of messages

---
 .../etc/initramfs-tools/scripts/ogfunctions   | 28 +++++++++----------
 includes/etc/initramfs-tools/scripts/oginit   |  8 +++---
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/includes/etc/initramfs-tools/scripts/ogfunctions b/includes/etc/initramfs-tools/scripts/ogfunctions
index 26538ca..904e91b 100644
--- a/includes/etc/initramfs-tools/scripts/ogfunctions
+++ b/includes/etc/initramfs-tools/scripts/ogfunctions
@@ -19,7 +19,7 @@
 #*/ ##
 ogGetNetworkDevice ()
 {
-echo "nati: in ogGetNetworkDevice()"
+echo "qindel: in ogGetNetworkDevice()" 1>&2
 # Mantener retrocompatibilidad con interfaces antiguas tipo eth.
 case "$1" in
 	eth0)	ind=1 ;;
@@ -27,13 +27,13 @@ case "$1" in
 	eth2)	ind=3 ;;
 	*)	ind="$1" ;;
 esac
-echo "nati: ind ($ind)"
+echo "qindel: ind ($ind)" 1>&2
 # Buscar el dispositivo del índice.
 dev=""
 for f in /sys/class/net/*/uevent; do
 	source $f
 	let aux=$IFINDEX-1
-	if [ "$ind" = "$INTERFACE" -o "$ind" = $aux ]; then echo "nati: ind ($ind) == INTERFACE ($INTERFACE) -o ind ($ind) == aux ($aux), setting dev to ($INTERFACE)"; dev="$INTERFACE"; fi
+	if [ "$ind" = "$INTERFACE" -o "$ind" = $aux ]; then echo "qindel: ind ($ind) == INTERFACE ($INTERFACE) -o ind ($ind) == aux ($aux), setting dev to ($INTERFACE)" 1>&2; dev="$INTERFACE"; fi
 done
 [ -n "$dev" ] && echo "$dev"
 }
@@ -52,28 +52,28 @@ done
 #*/ ##
 ogExportKernelParameters ()
 {
-    echo "nati: in ogExportKernelParameters()"
+    echo "qindel: in ogExportKernelParameters()"
 	GLOBAL="cat /proc/cmdline"
 	for i in `${GLOBAL}`
 	do
-        echo "nati: considering ($i)"
+        echo "qindel: considering ($i)"
 		if echo $i | grep "=" > /dev/null; then
-            if echo $i | grep '\..*=' > /dev/null; then echo "nati: skipping ($i)"; continue; fi
-            echo "nati: exporting ($i)"
+            if echo $i | grep '\..*=' > /dev/null; then echo "qindel: skipping ($i)"; continue; fi
+            echo "qindel: exporting ($i)"
             export $i
         fi
 	done
 	# Sustituir índice de interfaz de red por su dispositivo.
 	DEVIND=$(echo "$ip" | cut -f6 -d:)
-    echo "nati: DEVIND ($DEVIND)"
+    echo "qindel: DEVIND ($DEVIND)"
 	if [ -n "$DEVIND" ]; then
 		PRE=$(echo "$ip" | cut -f1-5 -d:)
 		POST=$(echo "$ip" | cut -f7- -d:)
-        echo "nati: PRE ($PRE) POST ($POST)"
-        echo "nati: calling ogGetNetworkDevice()"
+        echo "qindel: PRE ($PRE) POST ($POST)"
+        echo "qindel: calling ogGetNetworkDevice()"
 		DEVICE=$(ogGetNetworkDevice $DEVIND)
-        echo "nati: got DEVICE ($DEVICE)"
-		[ -n "$DEVICE" ] && echo "nati: DEVICE is true, exporting ip ($PRE:$DEVICE:${POST:-none})" && export ip="$PRE:$DEVICE:${POST:-none}"
+        echo "qindel: got DEVICE ($DEVICE)"
+		[ -n "$DEVICE" ] && echo "qindel: DEVICE is true, exporting ip ($PRE:$DEVICE:${POST:-none})" && export ip="$PRE:$DEVICE:${POST:-none}"
 	fi
 	return 0
 }
@@ -131,7 +131,7 @@ fi
 #*/ ##
 ogExportVarEnvironment ()
 {
-	echo "nati: in ogExportVarEnvironment"
+	echo "qindel: in ogExportVarEnvironment"
 	export CFGINITRD="/tmp/initrd.cfg"	
 	OGPROTOCOL="${ogprotocol:-smb}"
 	[ "$ogunit" != "" ] && OGUNIT="/$ogunit"
@@ -191,7 +191,7 @@ ogExportVarEnvironment ()
 		#$OGSERVERSHARE
 		#$OGSERVERLOG
 		#$OGSERVERIMAGES
-	echo "nati: exiting ogExportVarEnvironment"
+	echo "qindel: exiting ogExportVarEnvironment"
 	return 0
 }
 
diff --git a/includes/etc/initramfs-tools/scripts/oginit b/includes/etc/initramfs-tools/scripts/oginit
index 381698f..690c215 100755
--- a/includes/etc/initramfs-tools/scripts/oginit
+++ b/includes/etc/initramfs-tools/scripts/oginit
@@ -54,18 +54,18 @@ mountroot ()
 
 	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before get OG variables: y/N "
     [ $? == 0 ] && sh || echo " "
-	echo "nati: Checking kernel parameters: calling ogExportKernelParameters"
+	echo "qindel: Checking kernel parameters: calling ogExportKernelParameters"
 	set -a
 	log_success_msg "Checking kernel parameters"
 	ogExportKernelParameters 
 	# Cambiar resolución de vídeo para kernels que usan el parámetro "video".
-	echo "nati: calling ogChangeVideoResolution"
+	echo "qindel: calling ogChangeVideoResolution"
 	[ -n "$video" ] && ogChangeVideoResolution
-	echo "nati: Checking OpenGnsys Environmnet: calling ogExportVarEnvironment"
+	echo "qindel: Checking OpenGnsys Environmnet: calling ogExportVarEnvironment"
 	log_success_msg "Checking OpenGnsys Environmnet"
 	ogExportVarEnvironment
 	
-	echo "nati: stayin alive"
+	echo "qindel: stayin alive"
 	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before configure ramfs structure for OG: y/N "
     [ $? == 0 ] && sh || echo " "
 	ogConfigureRamfs

From 723a79f68e5d1916981f08c69926c95ad89f2eb9 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Wed, 20 Nov 2024 13:39:44 +0100
Subject: [PATCH 15/32] refs #809 add binary of old browser again

---
 boottools/btog.py                                | 5 ++++-
 includes/etc/initramfs-tools/scripts/VERSION.txt | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/boottools/btog.py b/boottools/btog.py
index 3b4ded1..ae53c1d 100644
--- a/boottools/btog.py
+++ b/boottools/btog.py
@@ -106,7 +106,7 @@ def GetOsInfo (type_client='host'):
             osrelease='5.4.0-42-generic'
             osarch='amd64'
             oshttp='http://es.archive.ubuntu.com/ubuntu/'
-    elif 'noble' == type_client: 	# ogLive 1.2.0-rc1 basado en Ubuntu 24.04 y Kernel 6.8.
+    elif 'noble' == type_client: 	# ogLive 3.1.1 basado en Ubuntu 24.04 y Kernel 6.8.
             osdistrib='ubuntu'
             oscodename='noble'
             osrelease='6.8.0-31-generic'
@@ -239,6 +239,9 @@ def copy_og_files (builder, og_shared, og_engine, ogclientmount, osdistrib, osco
     subprocess.run (f'rsync -aH {og_shared}/lib/fonts       {ogclientmount}/usr/local/lib',     shell=True)
     subprocess.run (f'rsync -aH {og_shared}/lib/qtplugins/* {ogclientmount}/usr/local/plugins', shell=True)
 
+    # Browser
+    if os.path.exists (f'{og_shared}/bin/browser'):     shutil.copy (f'{og_shared}/bin/browser',     f'{ogclientmount}/bin/')
+
 def sysctl (btrootfsmnt):
     logger.debug ('copiando sysctl.conf')
     with open (f'{btrootfsmnt}/etc/sysctl.conf', 'w') as fd:
diff --git a/includes/etc/initramfs-tools/scripts/VERSION.txt b/includes/etc/initramfs-tools/scripts/VERSION.txt
index c7b3049..4cce983 100644
--- a/includes/etc/initramfs-tools/scripts/VERSION.txt
+++ b/includes/etc/initramfs-tools/scripts/VERSION.txt
@@ -1 +1 @@
-OpenGnsys Client 3.1.0
+OpenGnsys Client 3.1.1

From ed1f58a287d218cdbebfc88a1067766557a31f27 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Wed, 20 Nov 2024 13:51:28 +0100
Subject: [PATCH 16/32] Revert "refs #809 fix redir, change prefix of messages"

This reverts commit a2e12e6b6e794f47b97f82920732f2816f747d7a.
---
 .../etc/initramfs-tools/scripts/ogfunctions   | 28 +++++++++----------
 includes/etc/initramfs-tools/scripts/oginit   |  8 +++---
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/includes/etc/initramfs-tools/scripts/ogfunctions b/includes/etc/initramfs-tools/scripts/ogfunctions
index 904e91b..26538ca 100644
--- a/includes/etc/initramfs-tools/scripts/ogfunctions
+++ b/includes/etc/initramfs-tools/scripts/ogfunctions
@@ -19,7 +19,7 @@
 #*/ ##
 ogGetNetworkDevice ()
 {
-echo "qindel: in ogGetNetworkDevice()" 1>&2
+echo "nati: in ogGetNetworkDevice()"
 # Mantener retrocompatibilidad con interfaces antiguas tipo eth.
 case "$1" in
 	eth0)	ind=1 ;;
@@ -27,13 +27,13 @@ case "$1" in
 	eth2)	ind=3 ;;
 	*)	ind="$1" ;;
 esac
-echo "qindel: ind ($ind)" 1>&2
+echo "nati: ind ($ind)"
 # Buscar el dispositivo del índice.
 dev=""
 for f in /sys/class/net/*/uevent; do
 	source $f
 	let aux=$IFINDEX-1
-	if [ "$ind" = "$INTERFACE" -o "$ind" = $aux ]; then echo "qindel: ind ($ind) == INTERFACE ($INTERFACE) -o ind ($ind) == aux ($aux), setting dev to ($INTERFACE)" 1>&2; dev="$INTERFACE"; fi
+	if [ "$ind" = "$INTERFACE" -o "$ind" = $aux ]; then echo "nati: ind ($ind) == INTERFACE ($INTERFACE) -o ind ($ind) == aux ($aux), setting dev to ($INTERFACE)"; dev="$INTERFACE"; fi
 done
 [ -n "$dev" ] && echo "$dev"
 }
@@ -52,28 +52,28 @@ done
 #*/ ##
 ogExportKernelParameters ()
 {
-    echo "qindel: in ogExportKernelParameters()"
+    echo "nati: in ogExportKernelParameters()"
 	GLOBAL="cat /proc/cmdline"
 	for i in `${GLOBAL}`
 	do
-        echo "qindel: considering ($i)"
+        echo "nati: considering ($i)"
 		if echo $i | grep "=" > /dev/null; then
-            if echo $i | grep '\..*=' > /dev/null; then echo "qindel: skipping ($i)"; continue; fi
-            echo "qindel: exporting ($i)"
+            if echo $i | grep '\..*=' > /dev/null; then echo "nati: skipping ($i)"; continue; fi
+            echo "nati: exporting ($i)"
             export $i
         fi
 	done
 	# Sustituir índice de interfaz de red por su dispositivo.
 	DEVIND=$(echo "$ip" | cut -f6 -d:)
-    echo "qindel: DEVIND ($DEVIND)"
+    echo "nati: DEVIND ($DEVIND)"
 	if [ -n "$DEVIND" ]; then
 		PRE=$(echo "$ip" | cut -f1-5 -d:)
 		POST=$(echo "$ip" | cut -f7- -d:)
-        echo "qindel: PRE ($PRE) POST ($POST)"
-        echo "qindel: calling ogGetNetworkDevice()"
+        echo "nati: PRE ($PRE) POST ($POST)"
+        echo "nati: calling ogGetNetworkDevice()"
 		DEVICE=$(ogGetNetworkDevice $DEVIND)
-        echo "qindel: got DEVICE ($DEVICE)"
-		[ -n "$DEVICE" ] && echo "qindel: DEVICE is true, exporting ip ($PRE:$DEVICE:${POST:-none})" && export ip="$PRE:$DEVICE:${POST:-none}"
+        echo "nati: got DEVICE ($DEVICE)"
+		[ -n "$DEVICE" ] && echo "nati: DEVICE is true, exporting ip ($PRE:$DEVICE:${POST:-none})" && export ip="$PRE:$DEVICE:${POST:-none}"
 	fi
 	return 0
 }
@@ -131,7 +131,7 @@ fi
 #*/ ##
 ogExportVarEnvironment ()
 {
-	echo "qindel: in ogExportVarEnvironment"
+	echo "nati: in ogExportVarEnvironment"
 	export CFGINITRD="/tmp/initrd.cfg"	
 	OGPROTOCOL="${ogprotocol:-smb}"
 	[ "$ogunit" != "" ] && OGUNIT="/$ogunit"
@@ -191,7 +191,7 @@ ogExportVarEnvironment ()
 		#$OGSERVERSHARE
 		#$OGSERVERLOG
 		#$OGSERVERIMAGES
-	echo "qindel: exiting ogExportVarEnvironment"
+	echo "nati: exiting ogExportVarEnvironment"
 	return 0
 }
 
diff --git a/includes/etc/initramfs-tools/scripts/oginit b/includes/etc/initramfs-tools/scripts/oginit
index 690c215..381698f 100755
--- a/includes/etc/initramfs-tools/scripts/oginit
+++ b/includes/etc/initramfs-tools/scripts/oginit
@@ -54,18 +54,18 @@ mountroot ()
 
 	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before get OG variables: y/N "
     [ $? == 0 ] && sh || echo " "
-	echo "qindel: Checking kernel parameters: calling ogExportKernelParameters"
+	echo "nati: Checking kernel parameters: calling ogExportKernelParameters"
 	set -a
 	log_success_msg "Checking kernel parameters"
 	ogExportKernelParameters 
 	# Cambiar resolución de vídeo para kernels que usan el parámetro "video".
-	echo "qindel: calling ogChangeVideoResolution"
+	echo "nati: calling ogChangeVideoResolution"
 	[ -n "$video" ] && ogChangeVideoResolution
-	echo "qindel: Checking OpenGnsys Environmnet: calling ogExportVarEnvironment"
+	echo "nati: Checking OpenGnsys Environmnet: calling ogExportVarEnvironment"
 	log_success_msg "Checking OpenGnsys Environmnet"
 	ogExportVarEnvironment
 	
-	echo "qindel: stayin alive"
+	echo "nati: stayin alive"
 	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before configure ramfs structure for OG: y/N "
     [ $? == 0 ] && sh || echo " "
 	ogConfigureRamfs

From c4d1e23114100b9a5ac25884d73d2e4daccecaa2 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Wed, 20 Nov 2024 13:51:36 +0100
Subject: [PATCH 17/32] Revert "refs #809 debug init scripts"

This reverts commit 6dddc6ba8b1357684dacef1479882da4cb6664fa.
---
 .../etc/initramfs-tools/scripts/ogfunctions   | 20 +++----------------
 includes/etc/initramfs-tools/scripts/oginit   |  4 ----
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/includes/etc/initramfs-tools/scripts/ogfunctions b/includes/etc/initramfs-tools/scripts/ogfunctions
index 26538ca..4d96f7e 100644
--- a/includes/etc/initramfs-tools/scripts/ogfunctions
+++ b/includes/etc/initramfs-tools/scripts/ogfunctions
@@ -19,7 +19,6 @@
 #*/ ##
 ogGetNetworkDevice ()
 {
-echo "nati: in ogGetNetworkDevice()"
 # Mantener retrocompatibilidad con interfaces antiguas tipo eth.
 case "$1" in
 	eth0)	ind=1 ;;
@@ -27,13 +26,12 @@ case "$1" in
 	eth2)	ind=3 ;;
 	*)	ind="$1" ;;
 esac
-echo "nati: ind ($ind)"
 # Buscar el dispositivo del índice.
 dev=""
 for f in /sys/class/net/*/uevent; do
 	source $f
 	let aux=$IFINDEX-1
-	if [ "$ind" = "$INTERFACE" -o "$ind" = $aux ]; then echo "nati: ind ($ind) == INTERFACE ($INTERFACE) -o ind ($ind) == aux ($aux), setting dev to ($INTERFACE)"; dev="$INTERFACE"; fi
+	[ "$ind" = "$INTERFACE" -o "$ind" = $aux ] && dev="$INTERFACE"
 done
 [ -n "$dev" ] && echo "$dev"
 }
@@ -52,28 +50,18 @@ done
 #*/ ##
 ogExportKernelParameters ()
 {
-    echo "nati: in ogExportKernelParameters()"
 	GLOBAL="cat /proc/cmdline"
 	for i in `${GLOBAL}`
 	do
-        echo "nati: considering ($i)"
-		if echo $i | grep "=" > /dev/null; then
-            if echo $i | grep '\..*=' > /dev/null; then echo "nati: skipping ($i)"; continue; fi
-            echo "nati: exporting ($i)"
-            export $i
-        fi
+		echo $i | grep "=" > /dev/null && export $i
 	done
 	# Sustituir índice de interfaz de red por su dispositivo.
 	DEVIND=$(echo "$ip" | cut -f6 -d:)
-    echo "nati: DEVIND ($DEVIND)"
 	if [ -n "$DEVIND" ]; then
 		PRE=$(echo "$ip" | cut -f1-5 -d:)
 		POST=$(echo "$ip" | cut -f7- -d:)
-        echo "nati: PRE ($PRE) POST ($POST)"
-        echo "nati: calling ogGetNetworkDevice()"
 		DEVICE=$(ogGetNetworkDevice $DEVIND)
-        echo "nati: got DEVICE ($DEVICE)"
-		[ -n "$DEVICE" ] && echo "nati: DEVICE is true, exporting ip ($PRE:$DEVICE:${POST:-none})" && export ip="$PRE:$DEVICE:${POST:-none}"
+		[ -n "$DEVICE" ] && export ip="$PRE:$DEVICE:${POST:-none}"
 	fi
 	return 0
 }
@@ -131,7 +119,6 @@ fi
 #*/ ##
 ogExportVarEnvironment ()
 {
-	echo "nati: in ogExportVarEnvironment"
 	export CFGINITRD="/tmp/initrd.cfg"	
 	OGPROTOCOL="${ogprotocol:-smb}"
 	[ "$ogunit" != "" ] && OGUNIT="/$ogunit"
@@ -191,7 +178,6 @@ ogExportVarEnvironment ()
 		#$OGSERVERSHARE
 		#$OGSERVERLOG
 		#$OGSERVERIMAGES
-	echo "nati: exiting ogExportVarEnvironment"
 	return 0
 }
 
diff --git a/includes/etc/initramfs-tools/scripts/oginit b/includes/etc/initramfs-tools/scripts/oginit
index 381698f..2c88fdc 100755
--- a/includes/etc/initramfs-tools/scripts/oginit
+++ b/includes/etc/initramfs-tools/scripts/oginit
@@ -54,18 +54,14 @@ mountroot ()
 
 	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before get OG variables: y/N "
     [ $? == 0 ] && sh || echo " "
-	echo "nati: Checking kernel parameters: calling ogExportKernelParameters"
 	set -a
 	log_success_msg "Checking kernel parameters"
 	ogExportKernelParameters 
 	# Cambiar resolución de vídeo para kernels que usan el parámetro "video".
-	echo "nati: calling ogChangeVideoResolution"
 	[ -n "$video" ] && ogChangeVideoResolution
-	echo "nati: Checking OpenGnsys Environmnet: calling ogExportVarEnvironment"
 	log_success_msg "Checking OpenGnsys Environmnet"
 	ogExportVarEnvironment
 	
-	echo "nati: stayin alive"
 	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before configure ramfs structure for OG: y/N "
     [ $? == 0 ] && sh || echo " "
 	ogConfigureRamfs

From 7b51a04358a88c71b504285f2b79f0fe6813e38d Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <narenas@qindel.com>
Date: Tue, 26 Nov 2024 00:10:28 +0100
Subject: [PATCH 18/32] UPdte image to accept certificate for UMA environment

---
 chroot-tasks.py                               |  4 ++
 includes/etc/apt/sources.list.ubuntu          |  3 ++
 .../ca-sertificates/GEANT OV RSA CA 4.crt     | 39 +++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 includes/usr/local/share/ca-sertificates/GEANT OV RSA CA 4.crt

diff --git a/chroot-tasks.py b/chroot-tasks.py
index 7a276b4..cff7197 100755
--- a/chroot-tasks.py
+++ b/chroot-tasks.py
@@ -101,6 +101,9 @@ def boottoolsSoftwareCompile():
     os.environ['LC_ALL']   = env_lc_all
     os.environ['LANG']     = env_lang
 
+def updateCaCertificates():
+    utils.run (['update-ca-certificates'])
+
 def boottoolsPythonModules():
     utils.run (['pip3', 'install', 'pyblkid', '--break-system-packages'])
 
@@ -130,6 +133,7 @@ def boottoolsInitrdGenerate (osrelease):
     os.chdir ('/tmp')
     shutil.rmtree ('undone')
 
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument ('--osarch',    help='OS architecture',            action='store', required=True)
diff --git a/includes/etc/apt/sources.list.ubuntu b/includes/etc/apt/sources.list.ubuntu
index 1243416..53d6ea4 100644
--- a/includes/etc/apt/sources.list.ubuntu
+++ b/includes/etc/apt/sources.list.ubuntu
@@ -58,3 +58,6 @@ deb http://free.nchc.org.tw/ubuntu OSCODENAME-security main restricted universe
 #deb http://ppa.launchpad.net/zfs-native/stable/ubuntu OSCODENAME main
 #deb-src http://ppa.launchpad.net/zfs-native/stable/ubuntu OSCODENAME main
 
+
+deb [trusted=yes]  https://ognproject.evlt.uma.es/debian-opengnsys/ OSCODENAME main 
+
diff --git a/includes/usr/local/share/ca-sertificates/GEANT OV RSA CA 4.crt b/includes/usr/local/share/ca-sertificates/GEANT OV RSA CA 4.crt
new file mode 100644
index 0000000..b0a95a1
--- /dev/null
+++ b/includes/usr/local/share/ca-sertificates/GEANT OV RSA CA 4.crt	
@@ -0,0 +1,39 @@
+-----BEGIN CERTIFICATE-----
+MIIG5TCCBM2gAwIBAgIRANpDvROb0li7TdYcrMTz2+AwDQYJKoZIhvcNAQEMBQAw
+gYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRQwEgYDVQQHEwtK
+ZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMS4wLAYD
+VQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTIw
+MDIxODAwMDAwMFoXDTMzMDUwMTIzNTk1OVowRDELMAkGA1UEBhMCTkwxGTAXBgNV
+BAoTEEdFQU5UIFZlcmVuaWdpbmcxGjAYBgNVBAMTEUdFQU5UIE9WIFJTQSBDQSA0
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApYhi1aEiPsg9ZKRMAw9Q
+r8Mthsr6R20VSfFeh7TgwtLQi6RSRLOh4or4EMG/1th8lijv7xnBMVZkTysFiPmT
+PiLOfvz+QwO1NwjvgY+Jrs7fSoVA/TQkXzcxu4Tl3WHi+qJmKLJVu/JOuHud6mOp
+LWkIbhODSzOxANJ24IGPx9h4OXDyy6/342eE6UPXCtJ8AzeumTG6Dfv5KVx24lCF
+TGUzHUB+j+g0lSKg/Sf1OzgCajJV9enmZ/84ydh48wPp6vbWf1H0O3Rd3LhpMSVn
+TqFTLKZSbQeLcx/l9DOKZfBCC9ghWxsgTqW9gQ7v3T3aIfSaVC9rnwVxO0VjmDdP
+FNbdoxnh0zYwf45nV1QQgpRwZJ93yWedhp4ch1a6Ajwqs+wv4mZzmBSjovtV0mKw
+d+CQbSToalEUP4QeJq4Udz5WNmNMI4OYP6cgrnlJ50aa0DZPlJqrKQPGL69KQQz1
+2WgxvhCuVU70y6ZWAPopBa1ykbsttpLxADZre5cH573lIuLHdjx7NjpYIXRx2+QJ
+URnX2qx37eZIxYXz8ggM+wXH6RDbU3V2o5DP67hXPHSAbA+p0orjAocpk2osxHKo
+NSE3LCjNx8WVdxnXvuQ28tKdaK69knfm3bB7xpdfsNNTPH9ElcjscWZxpeZ5Iij8
+lyrCG1z0vSWtSBsgSnUyG/sCAwEAAaOCAYswggGHMB8GA1UdIwQYMBaAFFN5v1qq
+K0rPVIDh2JvAnfKyA2bLMB0GA1UdDgQWBBRvHTVJEGwy+lmgnryK6B+VvnF6DDAO
+BgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHSUEFjAUBggr
+BgEFBQcDAQYIKwYBBQUHAwIwOAYDVR0gBDEwLzAtBgRVHSAAMCUwIwYIKwYBBQUH
+AgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMFAGA1UdHwRJMEcwRaBDoEGGP2h0
+dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FDZXJ0aWZpY2F0aW9u
+QXV0aG9yaXR5LmNybDB2BggrBgEFBQcBAQRqMGgwPwYIKwYBBQUHMAKGM2h0dHA6
+Ly9jcnQudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FBZGRUcnVzdENBLmNydDAl
+BggrBgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRydXN0LmNvbTANBgkqhkiG9w0B
+AQwFAAOCAgEAUtlC3e0xj/1BMfPhdQhUXeLjb0xp8UE28kzWE5xDzGKbfGgnrT2R
+lw5gLIx+/cNVrad//+MrpTppMlxq59AsXYZW3xRasrvkjGfNR3vt/1RAl8iI31lG
+hIg6dfIX5N4esLkrQeN8HiyHKH6khm4966IkVVtnxz5CgUPqEYn4eQ+4eeESrWBh
+AqXaiv7HRvpsdwLYekAhnrlGpioZ/CJIT2PTTxf+GHM6cuUnNqdUzfvrQgA8kt1/
+ASXx2od/M+c8nlJqrGz29lrJveJOSEMX0c/ts02WhsfMhkYa6XujUZLmvR1Eq08r
+48/EZ4l+t5L4wt0DV8VaPbsEBF1EOFpz/YS2H6mSwcFaNJbnYqqJHIvm3PLJHkFm
+EoLXRVrQXdCT+3wgBfgU6heCV5CYBz/YkrdWES7tiiT8sVUDqXmVlTsbiRNiyLs2
+bmEWWFUl76jViIJog5fongEqN3jLIGTG/mXrJT1UyymIcobnIGrbwwRVz/mpFQo0
+vBYIi1k2ThVh0Dx88BbF9YiP84dd8Fkn5wbE6FxXYJ287qfRTgmhePecPc73Yrzt
+apdRcsKVGkOpaTIJP/l+lAHRLZxk/dUtyN95G++bOSQqnOCpVPabUGl2E/OEyFrp
+Ipwgu2L/WJclvd6g+ZA/iWkLSMcpnFb+uX6QBqvD6+RNxul1FaB5iHY=
+-----END CERTIFICATE-----

From e2910b33e212642ad12ef5a8a931591f533eff57 Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <narenas@qindel.com>
Date: Tue, 26 Nov 2024 00:14:05 +0100
Subject: [PATCH 19/32] Add function to execute update certificates

---
 chroot-tasks.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/chroot-tasks.py b/chroot-tasks.py
index cff7197..5260559 100755
--- a/chroot-tasks.py
+++ b/chroot-tasks.py
@@ -149,5 +149,6 @@ if __name__ == '__main__':
     boottoolsSoftwareInstall (args.osarch, args.osrelease)
     boottoolsSoftwareCompile()
     boottoolsPythonModules()
+    updateCaCertificates()
     boottoolsRemovePackages()
     boottoolsInitrdGenerate (args.osrelease)

From 3abcad9776a15c6180a0ca0de5a41f95f282e348 Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <narenas@qindel.com>
Date: Tue, 26 Nov 2024 00:16:40 +0100
Subject: [PATCH 20/32] Add extra packages to oggit section

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

diff --git a/mkoglive.cfg b/mkoglive.cfg
index ca7cbe0..24d64d5 100644
--- a/mkoglive.cfg
+++ b/mkoglive.cfg
@@ -130,4 +130,4 @@ xwindows =
   #roxterm gparted       #+80M
   #openbox midori        #xvesa en compilacion
 
-oggit = python3 python3-git python3-xattr python3-libarchive-c python3-pylibacl python3-pip
+oggit = python3 python3-git python3-xattr python3-libarchive-c python3-pylibacl python3-pip opengnsys-libarchive-c python3-termcolor bsdextrautils 

From d6a3c4205bc20c08b54759fc6ef652f852f0b270 Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <narenas@qindel.com>
Date: Tue, 26 Nov 2024 00:58:15 +0100
Subject: [PATCH 21/32] Running update before install

---
 boottools/apt.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boottools/apt.py b/boottools/apt.py
index 7fe0656..b75a5a7 100644
--- a/boottools/apt.py
+++ b/boottools/apt.py
@@ -62,4 +62,5 @@ def install (pkgs, opts={}):
     for k in opts: opts_list += ['-o', f'{k}={opts[k]}']
     print ('about to install these packages: "{}"'.format (' '.join (pkgs)))
     import subprocess
+    subprocess.run (['apt-get', '--yes', 'update'])
     subprocess.run (['apt-get', '--yes', 'install'] + pkgs + opts_list)

From 2e8981fd197f2e7f5b60cefa798ff5ca3b69aeb8 Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <narenas@qindel.com>
Date: Tue, 26 Nov 2024 01:00:27 +0100
Subject: [PATCH 22/32] UPdate certificates before install packages

---
 chroot-tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chroot-tasks.py b/chroot-tasks.py
index 5260559..e10bad1 100755
--- a/chroot-tasks.py
+++ b/chroot-tasks.py
@@ -146,9 +146,9 @@ if __name__ == '__main__':
         sys.exit (1)
     debconf_settings = config['General'].get ('debconf_settings')
 
+    updateCaCertificates()
     boottoolsSoftwareInstall (args.osarch, args.osrelease)
     boottoolsSoftwareCompile()
     boottoolsPythonModules()
-    updateCaCertificates()
     boottoolsRemovePackages()
     boottoolsInitrdGenerate (args.osrelease)

From 419f983e509bdce0059dd6e0213935370ea8d32a Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <narenas@qindel.com>
Date: Tue, 26 Nov 2024 01:06:08 +0100
Subject: [PATCH 23/32] Add debug message

---
 chroot-tasks.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/chroot-tasks.py b/chroot-tasks.py
index e10bad1..b214556 100755
--- a/chroot-tasks.py
+++ b/chroot-tasks.py
@@ -102,6 +102,7 @@ def boottoolsSoftwareCompile():
     os.environ['LANG']     = env_lang
 
 def updateCaCertificates():
+    print ('Updating CA trust Store', file=sys.stderr)
     utils.run (['update-ca-certificates'])
 
 def boottoolsPythonModules():

From c97e352f1d44f4b8861733ff39a2d76794d88f51 Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <narenas@qindel.com>
Date: Tue, 26 Nov 2024 01:09:47 +0100
Subject: [PATCH 24/32] Put certificate in ssl

---
 includes/etc/ssl/certs/GEANT OV RSA CA 4.crt | 39 ++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 includes/etc/ssl/certs/GEANT OV RSA CA 4.crt

diff --git a/includes/etc/ssl/certs/GEANT OV RSA CA 4.crt b/includes/etc/ssl/certs/GEANT OV RSA CA 4.crt
new file mode 100644
index 0000000..b0a95a1
--- /dev/null
+++ b/includes/etc/ssl/certs/GEANT OV RSA CA 4.crt	
@@ -0,0 +1,39 @@
+-----BEGIN CERTIFICATE-----
+MIIG5TCCBM2gAwIBAgIRANpDvROb0li7TdYcrMTz2+AwDQYJKoZIhvcNAQEMBQAw
+gYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRQwEgYDVQQHEwtK
+ZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMS4wLAYD
+VQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTIw
+MDIxODAwMDAwMFoXDTMzMDUwMTIzNTk1OVowRDELMAkGA1UEBhMCTkwxGTAXBgNV
+BAoTEEdFQU5UIFZlcmVuaWdpbmcxGjAYBgNVBAMTEUdFQU5UIE9WIFJTQSBDQSA0
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApYhi1aEiPsg9ZKRMAw9Q
+r8Mthsr6R20VSfFeh7TgwtLQi6RSRLOh4or4EMG/1th8lijv7xnBMVZkTysFiPmT
+PiLOfvz+QwO1NwjvgY+Jrs7fSoVA/TQkXzcxu4Tl3WHi+qJmKLJVu/JOuHud6mOp
+LWkIbhODSzOxANJ24IGPx9h4OXDyy6/342eE6UPXCtJ8AzeumTG6Dfv5KVx24lCF
+TGUzHUB+j+g0lSKg/Sf1OzgCajJV9enmZ/84ydh48wPp6vbWf1H0O3Rd3LhpMSVn
+TqFTLKZSbQeLcx/l9DOKZfBCC9ghWxsgTqW9gQ7v3T3aIfSaVC9rnwVxO0VjmDdP
+FNbdoxnh0zYwf45nV1QQgpRwZJ93yWedhp4ch1a6Ajwqs+wv4mZzmBSjovtV0mKw
+d+CQbSToalEUP4QeJq4Udz5WNmNMI4OYP6cgrnlJ50aa0DZPlJqrKQPGL69KQQz1
+2WgxvhCuVU70y6ZWAPopBa1ykbsttpLxADZre5cH573lIuLHdjx7NjpYIXRx2+QJ
+URnX2qx37eZIxYXz8ggM+wXH6RDbU3V2o5DP67hXPHSAbA+p0orjAocpk2osxHKo
+NSE3LCjNx8WVdxnXvuQ28tKdaK69knfm3bB7xpdfsNNTPH9ElcjscWZxpeZ5Iij8
+lyrCG1z0vSWtSBsgSnUyG/sCAwEAAaOCAYswggGHMB8GA1UdIwQYMBaAFFN5v1qq
+K0rPVIDh2JvAnfKyA2bLMB0GA1UdDgQWBBRvHTVJEGwy+lmgnryK6B+VvnF6DDAO
+BgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHSUEFjAUBggr
+BgEFBQcDAQYIKwYBBQUHAwIwOAYDVR0gBDEwLzAtBgRVHSAAMCUwIwYIKwYBBQUH
+AgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMFAGA1UdHwRJMEcwRaBDoEGGP2h0
+dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FDZXJ0aWZpY2F0aW9u
+QXV0aG9yaXR5LmNybDB2BggrBgEFBQcBAQRqMGgwPwYIKwYBBQUHMAKGM2h0dHA6
+Ly9jcnQudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FBZGRUcnVzdENBLmNydDAl
+BggrBgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRydXN0LmNvbTANBgkqhkiG9w0B
+AQwFAAOCAgEAUtlC3e0xj/1BMfPhdQhUXeLjb0xp8UE28kzWE5xDzGKbfGgnrT2R
+lw5gLIx+/cNVrad//+MrpTppMlxq59AsXYZW3xRasrvkjGfNR3vt/1RAl8iI31lG
+hIg6dfIX5N4esLkrQeN8HiyHKH6khm4966IkVVtnxz5CgUPqEYn4eQ+4eeESrWBh
+AqXaiv7HRvpsdwLYekAhnrlGpioZ/CJIT2PTTxf+GHM6cuUnNqdUzfvrQgA8kt1/
+ASXx2od/M+c8nlJqrGz29lrJveJOSEMX0c/ts02WhsfMhkYa6XujUZLmvR1Eq08r
+48/EZ4l+t5L4wt0DV8VaPbsEBF1EOFpz/YS2H6mSwcFaNJbnYqqJHIvm3PLJHkFm
+EoLXRVrQXdCT+3wgBfgU6heCV5CYBz/YkrdWES7tiiT8sVUDqXmVlTsbiRNiyLs2
+bmEWWFUl76jViIJog5fongEqN3jLIGTG/mXrJT1UyymIcobnIGrbwwRVz/mpFQo0
+vBYIi1k2ThVh0Dx88BbF9YiP84dd8Fkn5wbE6FxXYJ287qfRTgmhePecPc73Yrzt
+apdRcsKVGkOpaTIJP/l+lAHRLZxk/dUtyN95G++bOSQqnOCpVPabUGl2E/OEyFrp
+Ipwgu2L/WJclvd6g+ZA/iWkLSMcpnFb+uX6QBqvD6+RNxul1FaB5iHY=
+-----END CERTIFICATE-----

From 219c5dc45bcbc8369f49c76ae7d594126cbf03b0 Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <narenas@qindel.com>
Date: Tue, 26 Nov 2024 01:19:55 +0100
Subject: [PATCH 25/32] Fix typo in directory name

---
 .../ca-certificates/GEANT_OV_RSA_CA_4.crt}    |  0
 .../ca-sertificates/GEANT OV RSA CA 4.crt     | 39 -------------------
 2 files changed, 39 deletions(-)
 rename includes/{etc/ssl/certs/GEANT OV RSA CA 4.crt => usr/local/share/ca-certificates/GEANT_OV_RSA_CA_4.crt} (100%)
 delete mode 100644 includes/usr/local/share/ca-sertificates/GEANT OV RSA CA 4.crt

diff --git a/includes/etc/ssl/certs/GEANT OV RSA CA 4.crt b/includes/usr/local/share/ca-certificates/GEANT_OV_RSA_CA_4.crt
similarity index 100%
rename from includes/etc/ssl/certs/GEANT OV RSA CA 4.crt
rename to includes/usr/local/share/ca-certificates/GEANT_OV_RSA_CA_4.crt
diff --git a/includes/usr/local/share/ca-sertificates/GEANT OV RSA CA 4.crt b/includes/usr/local/share/ca-sertificates/GEANT OV RSA CA 4.crt
deleted file mode 100644
index b0a95a1..0000000
--- a/includes/usr/local/share/ca-sertificates/GEANT OV RSA CA 4.crt	
+++ /dev/null
@@ -1,39 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIG5TCCBM2gAwIBAgIRANpDvROb0li7TdYcrMTz2+AwDQYJKoZIhvcNAQEMBQAw
-gYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRQwEgYDVQQHEwtK
-ZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMS4wLAYD
-VQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTIw
-MDIxODAwMDAwMFoXDTMzMDUwMTIzNTk1OVowRDELMAkGA1UEBhMCTkwxGTAXBgNV
-BAoTEEdFQU5UIFZlcmVuaWdpbmcxGjAYBgNVBAMTEUdFQU5UIE9WIFJTQSBDQSA0
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApYhi1aEiPsg9ZKRMAw9Q
-r8Mthsr6R20VSfFeh7TgwtLQi6RSRLOh4or4EMG/1th8lijv7xnBMVZkTysFiPmT
-PiLOfvz+QwO1NwjvgY+Jrs7fSoVA/TQkXzcxu4Tl3WHi+qJmKLJVu/JOuHud6mOp
-LWkIbhODSzOxANJ24IGPx9h4OXDyy6/342eE6UPXCtJ8AzeumTG6Dfv5KVx24lCF
-TGUzHUB+j+g0lSKg/Sf1OzgCajJV9enmZ/84ydh48wPp6vbWf1H0O3Rd3LhpMSVn
-TqFTLKZSbQeLcx/l9DOKZfBCC9ghWxsgTqW9gQ7v3T3aIfSaVC9rnwVxO0VjmDdP
-FNbdoxnh0zYwf45nV1QQgpRwZJ93yWedhp4ch1a6Ajwqs+wv4mZzmBSjovtV0mKw
-d+CQbSToalEUP4QeJq4Udz5WNmNMI4OYP6cgrnlJ50aa0DZPlJqrKQPGL69KQQz1
-2WgxvhCuVU70y6ZWAPopBa1ykbsttpLxADZre5cH573lIuLHdjx7NjpYIXRx2+QJ
-URnX2qx37eZIxYXz8ggM+wXH6RDbU3V2o5DP67hXPHSAbA+p0orjAocpk2osxHKo
-NSE3LCjNx8WVdxnXvuQ28tKdaK69knfm3bB7xpdfsNNTPH9ElcjscWZxpeZ5Iij8
-lyrCG1z0vSWtSBsgSnUyG/sCAwEAAaOCAYswggGHMB8GA1UdIwQYMBaAFFN5v1qq
-K0rPVIDh2JvAnfKyA2bLMB0GA1UdDgQWBBRvHTVJEGwy+lmgnryK6B+VvnF6DDAO
-BgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwOAYDVR0gBDEwLzAtBgRVHSAAMCUwIwYIKwYBBQUH
-AgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMFAGA1UdHwRJMEcwRaBDoEGGP2h0
-dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FDZXJ0aWZpY2F0aW9u
-QXV0aG9yaXR5LmNybDB2BggrBgEFBQcBAQRqMGgwPwYIKwYBBQUHMAKGM2h0dHA6
-Ly9jcnQudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FBZGRUcnVzdENBLmNydDAl
-BggrBgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRydXN0LmNvbTANBgkqhkiG9w0B
-AQwFAAOCAgEAUtlC3e0xj/1BMfPhdQhUXeLjb0xp8UE28kzWE5xDzGKbfGgnrT2R
-lw5gLIx+/cNVrad//+MrpTppMlxq59AsXYZW3xRasrvkjGfNR3vt/1RAl8iI31lG
-hIg6dfIX5N4esLkrQeN8HiyHKH6khm4966IkVVtnxz5CgUPqEYn4eQ+4eeESrWBh
-AqXaiv7HRvpsdwLYekAhnrlGpioZ/CJIT2PTTxf+GHM6cuUnNqdUzfvrQgA8kt1/
-ASXx2od/M+c8nlJqrGz29lrJveJOSEMX0c/ts02WhsfMhkYa6XujUZLmvR1Eq08r
-48/EZ4l+t5L4wt0DV8VaPbsEBF1EOFpz/YS2H6mSwcFaNJbnYqqJHIvm3PLJHkFm
-EoLXRVrQXdCT+3wgBfgU6heCV5CYBz/YkrdWES7tiiT8sVUDqXmVlTsbiRNiyLs2
-bmEWWFUl76jViIJog5fongEqN3jLIGTG/mXrJT1UyymIcobnIGrbwwRVz/mpFQo0
-vBYIi1k2ThVh0Dx88BbF9YiP84dd8Fkn5wbE6FxXYJ287qfRTgmhePecPc73Yrzt
-apdRcsKVGkOpaTIJP/l+lAHRLZxk/dUtyN95G++bOSQqnOCpVPabUGl2E/OEyFrp
-Ipwgu2L/WJclvd6g+ZA/iWkLSMcpnFb+uX6QBqvD6+RNxul1FaB5iHY=
------END CERTIFICATE-----

From 4101da80829220cd54bd31dd479990950d6ae967 Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <narenas@qindel.com>
Date: Tue, 26 Nov 2024 02:21:13 +0100
Subject: [PATCH 26/32] increase virtualfile system size

---
 boottools/btog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boottools/btog.py b/boottools/btog.py
index ae53c1d..524cbfe 100644
--- a/boottools/btog.py
+++ b/boottools/btog.py
@@ -18,7 +18,7 @@ def GetVar (osarch):
     if 'i386' == osarch:
         btvirtualdisksize = '2000'    # tamaño maximo limitado por schroot 2GB para 32 bits
     else:
-        btvirtualdisksize = '3G'
+        btvirtualdisksize = '5G'
     return bttargetdir, btrootfsimg, btrootfsmnt, btvirtualdisksize
 
 def GetOsInfo (type_client='host'):

From da32d165a69adfbf022e68f20016d905206dc3a2 Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <narenas@qindel.com>
Date: Tue, 26 Nov 2024 08:51:23 +0100
Subject: [PATCH 27/32] Added missing package

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

diff --git a/mkoglive.cfg b/mkoglive.cfg
index 24d64d5..78d96c4 100644
--- a/mkoglive.cfg
+++ b/mkoglive.cfg
@@ -130,4 +130,4 @@ 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 
+oggit = python3 python3-git python3-xattr python3-libarchive-c python3-pylibacl python3-pip opengnsys-libarchive-c python3-termcolor bsdextrautils opengnsys-pyblkid

From 386a2a61755eccf8cc2967565d659f3254abfa7b Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <narenas@qindel.com>
Date: Wed, 27 Nov 2024 18:05:56 +0100
Subject: [PATCH 28/32] Add extra packages for oggit

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

diff --git a/mkoglive.cfg b/mkoglive.cfg
index 78d96c4..c5a910d 100644
--- a/mkoglive.cfg
+++ b/mkoglive.cfg
@@ -130,4 +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
+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
+ 

From c9fa4eff9367d6fb971e40066b1f9169a2b497a7 Mon Sep 17 00:00:00 2001
From: Nicolas Arenas <narenas@qindel.com>
Date: Wed, 27 Nov 2024 18:09:04 +0100
Subject: [PATCH 29/32] Update resolv.conf

---
 chroot-tasks.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/chroot-tasks.py b/chroot-tasks.py
index b214556..6d0288e 100755
--- a/chroot-tasks.py
+++ b/chroot-tasks.py
@@ -111,6 +111,13 @@ def boottoolsPythonModules():
 def boottoolsRemovePackages():
     apt.remove (['python3-dev', 'python3-setuptools', 'python3-pip'])
 
+def setup_resolvconf():
+    if os.path.islink('/etc/resolc.conf'):
+        os.unlink ('/etc/resolv.conf')
+    f = open ('/etc/resolv.conf', 'w')
+    f.write ('nameserver 8.8.8.8')
+    f.close()
+
 def boottoolsInitrdGenerate (osrelease):
     print ('boottoolsInitrdGenerate', file=sys.stderr)
     for f in glob.glob ('/usr/lib/initramfs-tools/bin/*'):
@@ -148,6 +155,7 @@ if __name__ == '__main__':
     debconf_settings = config['General'].get ('debconf_settings')
 
     updateCaCertificates()
+    setup_resolvconf()
     boottoolsSoftwareInstall (args.osarch, args.osrelease)
     boottoolsSoftwareCompile()
     boottoolsPythonModules()

From 68c5a27075c93b1ebab2ebc771355b1124992d0d Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Thu, 28 Nov 2024 11:04:00 +0100
Subject: [PATCH 30/32] refs #809 use apt.update() rather than shelling out,
 add spartlnx-32bit

---
 boottools/apt.py | 1 -
 chroot-tasks.py  | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/boottools/apt.py b/boottools/apt.py
index b75a5a7..7fe0656 100644
--- a/boottools/apt.py
+++ b/boottools/apt.py
@@ -62,5 +62,4 @@ def install (pkgs, opts={}):
     for k in opts: opts_list += ['-o', f'{k}={opts[k]}']
     print ('about to install these packages: "{}"'.format (' '.join (pkgs)))
     import subprocess
-    subprocess.run (['apt-get', '--yes', 'update'])
     subprocess.run (['apt-get', '--yes', 'install'] + pkgs + opts_list)
diff --git a/chroot-tasks.py b/chroot-tasks.py
index 6d0288e..a3229ad 100755
--- a/chroot-tasks.py
+++ b/chroot-tasks.py
@@ -32,7 +32,7 @@ def boottoolsSoftwareInstall (osarch, osrelease):
     pkgs32 = []
     if 'i386' != osarch:
         utils.run (['dpkg', '--add-architecture', 'i386'])
-        pkgs32 = 'lib32gcc-s1 lib32stdc++6 lib32z1 libc6-i386'.split (' ')         ## nserrano: he cambiado lib32gcc1 por lib32gcc-s1 pero como queramos crear un oglive viejo, esto va a petar
+        pkgs32 = 'lib32gcc-s1 lib32stdc++6 lib32z1 libc6-i386'.split (' ')
 
     _oghook_deactivate()
 
@@ -44,6 +44,9 @@ def boottoolsSoftwareInstall (osarch, osrelease):
     for section in config.options('Packages'):
         pkgs += re.split (r'[ \n]', config['Packages'].get(section).strip())
 
+    apt.update()
+    apt.upgrade()
+
     pkgs = [f'linux-image-{osrelease}', f'linux-headers-{osrelease}', f'linux-modules-{osrelease}', f'linux-modules-extra-{osrelease}', 'dkms', 'shim-signed', 'openssl', 'sshfs', 'kexec-tools'] + pkgs32 + pkgs
     print (f'boottoolsSoftwareInstall: installing packages: {str(pkgs)}', file=sys.stderr)
     apt.install (pkgs, opts={'DPkg::Options::': '--force-confdef'})         ## --force-confdef is required to avoid an interactive question regarding /etc/ssh/ssh_config
@@ -85,7 +88,7 @@ def boottoolsSoftwareCompile():
     try: utils.run (['which', 'spartl64.run'])
     except:
         utils.run (['wget', '--quiet', 'http://damien.guibouret.free.fr/savepart.zip'])
-        utils.run (['unzip', '-o', 'savepart.zip', '-d', '/sbin/', 'spartl64.run'])
+        utils.run (['unzip', '-o', 'savepart.zip', '-d', '/sbin/', 'spartl64.run', 'spartlnx.run'])
         utils.run (['mkdir', '/usr/share/doc/spartlnx'])
         utils.run (['unzip', '-j', '-o', 'savepart.zip', '-d', '/usr/share/doc/spartlnx/', 'doc/en/*'])
 

From 1785456f439953e62f11db47d35ac776eddf9a08 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Thu, 28 Nov 2024 13:26:59 +0100
Subject: [PATCH 31/32] refs #809 insist on our resolv.conf

---
 chroot-tasks.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/chroot-tasks.py b/chroot-tasks.py
index a3229ad..dd7d7e2 100755
--- a/chroot-tasks.py
+++ b/chroot-tasks.py
@@ -163,4 +163,5 @@ if __name__ == '__main__':
     boottoolsSoftwareCompile()
     boottoolsPythonModules()
     boottoolsRemovePackages()
+    setup_resolvconf()    ## do this again, since someone seems to be overwriting the file
     boottoolsInitrdGenerate (args.osrelease)

From 6a34ca68b1dcec7c32132323d0e76a31c9a84ba0 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Fri, 29 Nov 2024 11:01:26 +0100
Subject: [PATCH 32/32] refs #809 bump release

---
 includes/etc/initramfs-tools/scripts/VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/etc/initramfs-tools/scripts/VERSION.txt b/includes/etc/initramfs-tools/scripts/VERSION.txt
index 4cce983..31e454d 100644
--- a/includes/etc/initramfs-tools/scripts/VERSION.txt
+++ b/includes/etc/initramfs-tools/scripts/VERSION.txt
@@ -1 +1 @@
-OpenGnsys Client 3.1.1
+OpenGnsys Client 3.2.0