19 changed files with 617 additions and 994 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,118 +0,0 @@
-# Changelog
-
-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.13.0] - 2025-08-08
-
-### Added
-
- Have filebeat collect OGAgentUser logs in /home
-
-## [3.12.1] - 2025-08-05
-
-### Added
-
- Save a log of early init (oginit/ogfuncions)
-
-## [3.12.0] - 2025-07-31
-
-### Changed
-
- Have /sbin/init run the python init
-
-## [3.11.2] - 2025-07-18
-
-### Changed
-
- Don't use the "@euro" locales
-
-## [3.11.1] - 2025-07-11
-
-### Fixed
-
- Fix opensearch pipeline
-
-## [3.11.0] - 2025-07-11
-
-### Added
-
- Install filebeat
-
-## [3.10.1] - 2025-07-03
-
-### Changed
-
- Undo the pcp/dstat change--does nothing
-
-## [3.10.0] - 2025-07-03
-
-### Changed
-
- Explicitly remove pcp and install dstat
-
-## [3.9.2] - 2025-06-26
-
-### Fixed
-
- Include dbus env var in .xinitrc
-
-## [3.9.1] - 2025-06-18
-
-### Fixed
-
- Increase "open files" ulimit for the qt6 browser
-
-## [3.9.0] - 2025-06-16
-
-### Added
-
- Take ogrepository SSH key from its git repo
-
-## [3.8.0] - 2025-06-16
-
-### Added
-
- Installation of package opengnsys-gitlib
-
-## [3.7.0] - 2025-05-28
-
-### Changed
-
- Leave resolv.conf as a symlink to /run/resolvconf/resolv.conf
-
-## [3.6.0] - 2025-05-21
-
-### Changed
-
- Configure stunnel and dbus via includes rather than in python code
-
-### Added
-
- Add script for changing the URL in the running browser
-
-## [3.5.0] - 2025-05-19
-
-### Changed
-
- Configure dbus
-
-## [3.4.0] - 2025-05-18
-
-### Changed
-
- Install and configure stunnel in the image
-
-## [3.3.0] - 2025-05-14
-
-### Changed
-
- Add changes required for the new browser
-
-## [3.2.1] - 2025-03-31
-
-### Changed
-
- Include build date in the final VERSION.txt
--- a/2
+++ b/2
@ -30,7 +30,7 @@ ARG OPENGNSYS_HEAD
 COPY . /tmp/opengnsys/oglive_builder/

 RUN ls -la /tmp/opengnsys/oglive_builder/ && \
-    mv /tmp/opengnsys/oglive_builder/engine /tmp/opengnsys/oglive_builder/shared /tmp/opengnsys/oglive_builder/ogrepo-ssh-key /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
--- a/boottools/btog.py
+++ b/boottools/btog.py
@ -205,7 +205,7 @@ def debootstrap (btrootfsimg, btrootfsmnt, osarch, oscodename, oshttp):
    logger.info (f'debootstrap --arch="{osarch}" --components=main,universe "{oscodename}" "{btrootfsmnt}" "{oshttp}" : ok')
    return 0

-def copy_og_files (builder, og_shared, ogrepo_ssh_key, ogclientmount, osdistrib, oscodename):
+def copy_og_files (builder, og_shared, og_engine, ogclientmount, osdistrib, oscodename):
    logger.info ('Iniciando la personalización con datos del repositorio')

    sources_list_in  = f'{builder}/includes/etc/apt/sources.list.{osdistrib.lower()}'
@ -226,14 +226,9 @@ def copy_og_files (builder, og_shared, ogrepo_ssh_key, ogclientmount, osdistrib,
    os.makedirs (f'{ogclientmount}/usr/local/lib',                 exist_ok=True)
    os.makedirs (f'{ogclientmount}/usr/local/plugins',             exist_ok=True)

-    os.makedirs (f'{ogclientmount}/root/.ssh', exist_ok=True)
-    shutil.copy (f'{ogrepo_ssh_key}/opengnsys',     f'{ogclientmount}/root/.ssh/id_ed25519')
-    shutil.copy (f'{ogrepo_ssh_key}/opengnsys.pub', f'{ogclientmount}/root/.ssh/id_ed25519.pub')
-    os.chmod (f'{ogclientmount}/root/.ssh/id_ed25519',     0o0600)
-    os.chmod (f'{ogclientmount}/root/.ssh/id_ed25519.pub', 0o0600)
-
-    subprocess.run (f'rsync -aH {builder}/includes/* {ogclientmount}/'              , shell=True)
-    subprocess.run (f'rsync -aH {og_shared}/*        {ogclientmount}/opt/opengnsys/', shell=True)
+    subprocess.run (f'rsync -aH {builder}/includes/* {ogclientmount}/'                             , shell=True)
+    subprocess.run (f'rsync -aH {og_shared}/*        {ogclientmount}/opt/opengnsys/'               , shell=True)
+    subprocess.run (f'rsync -aH {og_engine}/*        {ogclientmount}/opt/opengnsys/lib/engine/bin/', shell=True)

    if not os.path.exists (f'{ogclientmount}/etc/pci.ids'):
        shutil.copy (f'{og_shared}/lib/pci.ids', f'{ogclientmount}/etc/')
@ -245,7 +240,7 @@ def copy_og_files (builder, og_shared, ogrepo_ssh_key, ogclientmount, osdistrib,
    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/')
+    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')
--- a/chroot-tasks.py
+++ b/chroot-tasks.py
@ -87,7 +87,7 @@ def boottoolsSoftwareCompile():
    print ('boottoolsSoftwareCompile: spartlnx', file=sys.stderr)
    try: utils.run (['which', 'spartl64.run'])
    except:
-        utils.run (['wget', '--tries=5', 'http://damien.guibouret.free.fr/savepart.zip'])
+        utils.run (['wget', '--quiet', 'http://damien.guibouret.free.fr/savepart.zip'])
        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/*'])
@ -95,7 +95,7 @@ def boottoolsSoftwareCompile():
    if not os.path.exists ('python-libfdisk'):
        print ('boottoolsSoftwareCompile: python-libfdisk', file=sys.stderr)
        apt.install (['python3-psutil', 'python3-dev', 'libfdisk-dev', 'python3-setuptools'])
-        utils.run (['git', 'clone', 'https://ognproject.evlt.uma.es/gitea/48k.eu-mirror/python-libfdisk.git'])
+        utils.run (['git', 'clone', 'git://git.48k.eu/python-libfdisk'])
        os.chdir ('python-libfdisk')
        utils.run (['python3', 'setup.py', 'install'])
        os.chdir ('..')
@ -112,23 +112,15 @@ def boottoolsPythonModules():
    utils.run (['pip3', 'install', 'pyblkid', '--break-system-packages'])

 def boottoolsRemovePackages():
-    print ('boottoolsRemovePackages', file=sys.stderr)
    apt.remove (['python3-dev', 'python3-setuptools', 'python3-pip'])

-## have working DNS during the build
-def setup_resolvconf1():
-    print ('setup_resolvconf1', file=sys.stderr)
-    os.unlink ('/etc/resolv.conf')
+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()

-## leave the final configuration for oglive
-def setup_resolvconf2():
-    print ('setup_resolvconf2', file=sys.stderr)
-    os.unlink ('/etc/resolv.conf')
-    os.symlink ('/run/resolvconf/resolv.conf', '/etc/resolv.conf')
-
 def boottoolsInitrdGenerate (osrelease):
    print ('boottoolsInitrdGenerate', file=sys.stderr)
    for f in glob.glob ('/usr/lib/initramfs-tools/bin/*'):
@ -166,10 +158,10 @@ if __name__ == '__main__':
    debconf_settings = config['General'].get ('debconf_settings')

    updateCaCertificates()
-    setup_resolvconf1()
+    setup_resolvconf()
    boottoolsSoftwareInstall (args.osarch, args.osrelease)
    boottoolsSoftwareCompile()
    boottoolsPythonModules()
    boottoolsRemovePackages()
-    setup_resolvconf2()
+    setup_resolvconf()    ## do this again, since someone seems to be overwriting the file
    boottoolsInitrdGenerate (args.osrelease)
--- a/includes/etc/apt/sources.list.ubuntu
+++ b/includes/etc/apt/sources.list.ubuntu
@ -59,5 +59,5 @@ deb http://free.nchc.org.tw/ubuntu OSCODENAME-security main restricted universe
 #deb-src http://ppa.launchpad.net/zfs-native/stable/ubuntu OSCODENAME main


-deb [trusted=yes]  https://ognproject.evlt.uma.es/debian-opengnsys/opengnsys OSCODENAME main 
+deb [trusted=yes]  https://ognproject.evlt.uma.es/debian-opengnsys/ OSCODENAME main 

--- a/includes/etc/dbus-1/system.d/ogbrowser.conf
+++ b/includes/etc/dbus-1/system.d/ogbrowser.conf
@ -1,8 +0,0 @@
-<busconfig>
-    <policy user="root">
-        <allow own="es.opengnsys.OGBrowser.browser"/>
-        <allow send_destination="es.opengnsys.OGBrowser.browser"/>
-        <allow send_interface="es.opengnsys.OGBrowser.browser"/>
-        <allow send_type="method_call"/>
-    </policy>
-</busconfig>
--- a/includes/etc/environment
+++ b/includes/etc/environment
@ -1,6 +1,4 @@
-LC_TYPE=es_ES.UTF-8
-LC_ALL=es_ES.UTF-8
-LANG=es_ES.UTF-8
-LANGUAGE=es_ES.UTF-8
-XDG_RUNTIME_DIR=/run/user/0
-QTWEBENGINE_CHROMIUM_FLAGS=--no-sandbox
+LC_TYPE=es_ES@euro
+LC_ALL=es_ES@euro
+LANG=es_ES@euro
+LANGUAGE=es_ES@euro
--- a/includes/etc/filebeat/filebeat.yml
+++ b/includes/etc/filebeat/filebeat.yml
@ -1,29 +0,0 @@
-filebeat.inputs:
- type: log
-  enabled: true
-  paths:
-    - /var/log/opengnsys.json.log
-    - /home/*/opengnsys.json.log
-
-setup.template.settings:
-  index.number_of_shards: 1
-
-output.elasticsearch:
-  hosts: ["__OGLOG_IP__:__OGLOG_PORT__"]
-  pipeline: "filebeat_opengnsys_pipeline"
-  username: "filebeat_writer"
-  password: "__OPENSEARCH_PASSWORD__"
-  protocol: "https"
-  ssl.enabled: true
-  ssl.verification_mode: none
-  #ssl.certificate: "/opt/opengnsys/etc/filebeat.crt.pem"
-  #ssl.key: "/opt/opengnsys/etc/filebeat.key.pem"
-
-processors:
-  - add_host_metadata:
-      when.not.contains.tags: forwarded
-  - add_cloud_metadata: ~
-  - add_docker_metadata: ~
-  - add_kubernetes_metadata: ~
-
-seccomp.enabled: false
--- a/includes/etc/initramfs-tools/hooks/oghooks
+++ b/includes/etc/initramfs-tools/hooks/oghooks
@ -38,9 +38,6 @@ 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 700 ${DESTDIR}/run/user/0
-

 # Insert basic binaries
 copy_exec /bin/bash-static /bin/bash
--- a/includes/etc/initramfs-tools/modules
+++ b/includes/etc/initramfs-tools/modules
@ -15,9 +15,6 @@
 #fbcon

 # Kernel 3.7+ video.
-virtio_gpu
-vmwgfx
-
 uvesafb

 # Generales
--- a/includes/etc/initramfs-tools/scripts/VERSION.txt
+++ b/includes/etc/initramfs-tools/scripts/VERSION.txt
@ -1 +1 @@
-OpenGnsys Client 3.13.0
+OpenGnsys Client 3.2.0
--- a/includes/etc/initramfs-tools/scripts/ogfunctions
+++ b/includes/etc/initramfs-tools/scripts/ogfunctions
--- a/includes/etc/initramfs-tools/scripts/oginit
+++ b/includes/etc/initramfs-tools/scripts/oginit
@ -32,104 +32,115 @@
 #@date    2013/02/18
 #*/

-og_ask() {
-    echo "$1" >>/tmp/oginit.log
-    [ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "$1: y/N "; [ $? == 0 ] && sh || echo " "
-}
-
-mountroot () {
-    [ -f /scripts/VERSION.txt ] && OGVERSION=$(cat /scripts/VERSION.txt)
-    OGVERSION=${OGVERSION:-"OpenGnsys Client"}
-    echo; echo; echo "$OGVERSION"; echo; echo
-
-    #[ "$quiet" != "y" ] && log_begin_msg "Running OpenGnsys /scripts/og-top"
-    #run_scripts /scripts/og-top
-    #[ "$quiet" != "y" ] && log_end_msg
-
-    . /scripts/functions
-    . /scripts/ogfunctions
-
-    # If the root device hasn't shown up yet, give it a little while
-    # to deal with removable devices
-    sleep 2
-
-
-    og_ask "Stop before get OG variables"
-    set -a
-    log_success_msg "Checking kernel parameters"
-    ogExportKernelParameters
-    [ -n "$video" ] && ogChangeVideoResolution      # Cambiar resolución de vídeo para kernels que usan el parámetro "video".
-    log_success_msg "Checking OpenGnsys Environmnet"
-    ogExportVarEnvironment
-
-
-    og_ask "Stop before configure ramfs structure for OG"
-    ogConfigureRamfs
-
-
-    og_ask "Stop before configure netmoule specified in kernel parameters"
-    ogLoadNetModule
-
-    #[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/og-premount"
-    #run_scripts /scripts/og-premount
-    #[ "$quiet" != "y" ] && log_end_msg
-
-
-    og_ask "Stop before configure networking"
-    if [ -n "$oglive" ]; then
-        while !(ping -c 1 $oglive &> /dev/null); do
-            ogConfigureNetworking
-        done
-    fi
-    log_success_msg "config networking"
-    ogConfigureLoopback
-    log_success_msg "config loopback"
-
-
-    og_ask "Stop before detect rootserver"
-    ogGetROOTSERVER && log_success_msg "Get Info from pxe server and ckeck distribuited OG services "
-
-
-    if [ "$ogupdateinitrd" == "true" ]; then
-        og_ask "Stop before check updating initrd"
-    fi
-    if [ "$ogupdateinitrd" == "true" -o ! -d /lib/modules/$(uname -r) ]; then
-        ogUpdateInitrd    # Actualizar Initrd si se solicita o si no se corresponde con su kernel.
-    fi
-
-
-    og_ask "Stop before connect and merging the rootfs -ogLive- with $OGSERVERLIVE"
-    ogConnectOgLive && log_success_msg "Merge the initrd with the remote rootfs -ogLive- on $OGSERVERLIVE" || sh
-    # si es necesario realiza ogConnect $OGSERVERLIVE $OGPROTOCOL $SRCOGLIVE $DSTOGLIVE
-
-
-    og_ask "Stop before connect with client dir SHARE -engine,scripts,interface, -share- on $OGSERVERSHARE "
-    ogConnect $OGSERVERSHARE $OGPROTOCOL $SRCOGSHARE $DSTOGSHARE
-    if [ $? -ne 0 -a "$SRCOGSHARE" != "$DEFOGSHARE" ]; then
-        ogConnect $OGSERVERSHARE $OGPROTOCOL $DEFOGSHARE $DSTOGSHARE && SRCOGSHARE=$DEFOGSHARE
-    fi
-    unset DEFOGSHARE
-
-
-    og_ask "Stop before connect with client dir LOG STORAGE on $OGSERVERLOG "
-    ogConnect $OGSERVERLOG $OGPROTOCOL $SRCOGLOG $DSTOGLOG
-
-
-    og_ask "Stop before connect with REPOSITORY STORAGE on $OGSERVERIMAGES "
-    ogConnect $OGSERVERIMAGES $OGPROTOCOL $SRCOGIMAGES $DSTOGIMAGES ,ro
-
-
-    og_ask "Stop before doing the postconfiguration"
-    ogPostConfigureFS
-    setupcon -k
-
-
-    og_ask "Stop before calling oginit with /etc/inittab"
-    if [ "$oginit" ]; then
-        echo "exec oginit ($oginit)" >>/tmp/oginit.log
-        exec $oginit
-    else
-        echo "exec regular init" >>/tmp/oginit.log
-        exec init
-    fi
+
+# Parameter: Where to mount the filesystem
+mountroot ()
+{
+	[ -f /scripts/VERSION.txt ] && OGVERSION=$(cat /scripts/VERSION.txt)
+	OGVERSION=${OGVERSION:-"OpenGnsys Client"}
+	echo; echo; echo "$OGVERSION"; echo; echo
+
+	#[ "$quiet" != "y" ] && log_begin_msg "Running OpenGnsys /scripts/og-top"
+	#run_scripts /scripts/og-top
+	#[ "$quiet" != "y" ] && log_end_msg
+
+	# If the root device hasn't shown up yet, give it a little while
+	# to deal with removable devices
+
+	. /scripts/functions
+	. /scripts/ogfunctions
+
+	sleep 2
+
+	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before get OG variables: y/N "
+    [ $? == 0 ] && sh || echo " "
+	set -a
+	log_success_msg "Checking kernel parameters"
+	ogExportKernelParameters 
+	# Cambiar resolución de vídeo para kernels que usan el parámetro "video".
+	[ -n "$video" ] && ogChangeVideoResolution
+	log_success_msg "Checking OpenGnsys Environmnet"
+	ogExportVarEnvironment
+	
+	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before configure ramfs structure for OG: y/N "
+    [ $? == 0 ] && sh || echo " "
+	ogConfigureRamfs
+
+	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before configure netmoule specified in kernel parameters: y/N "
+    [ $? == 0 ] && sh || echo " "
+	ogLoadNetModule
+
+	#[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/og-premount"
+	#run_scripts /scripts/og-premount
+	#[ "$quiet" != "y" ] && log_end_msg
+
+	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before configure networking: y/N "
+    [ $? == 0 ] && sh || echo " "
+	if [ -n "$oglive" ]
+	then
+		while !(ping -c 1 $oglive &> /dev/null)
+		do
+			ogConfigureNetworking
+		done
+	fi
+	log_success_msg "config networking"
+	ogConfigureLoopback
+	log_success_msg "config loopback"
+
+
+	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before detect rootserver: y/N "
+    [ $? == 0 ] && sh || echo " "
+	ogGetROOTSERVER && log_success_msg "Get Info from pxe server and ckeck distribuited OG services " 
+
+
+	if [ "$ogdebug" == "true" -a "$ogupdateinitrd" == "true" ]; then
+		ogYesNo --timeout 5 --default no "Stop before check updating initrd: y/N "
+    	[ $? == 0 ] && sh || echo " "		
+	fi
+	# Actualizar Initrd si se solicita o si no se corresponde con su kernel.
+	if [ "$ogupdateinitrd" == "true" -o ! -d /lib/modules/$(uname -r) ]; then
+		ogUpdateInitrd
+	fi
+
+	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before connect and merging the rootfs -ogLive- with $OGSERVERLIVE: y/N "
+    [ $? == 0 ] && sh || echo " "
+	ogConnectOgLive && log_success_msg "Merge the initrd with the remote rootfs -ogLive- on $OGSERVERLIVE" || sh
+    # si es necesario realiza ogConnect $OGSERVERLIVE $OGPROTOCOL $SRCOGLIVE $DSTOGLIVE 
+
+	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before connect with client dir SHARE -engine,scripts,interface, -share- on $OGSERVERSHARE : y/N "
+    [ $? == 0 ] && sh || echo " "
+	ogConnect $OGSERVERSHARE $OGPROTOCOL $SRCOGSHARE $DSTOGSHARE 
+	if [ $? -ne 0 -a "$SRCOGSHARE" != "$DEFOGSHARE" ]; then
+		ogConnect $OGSERVERSHARE $OGPROTOCOL $DEFOGSHARE $DSTOGSHARE && SRCOGSHARE=$DEFOGSHARE
+	fi
+	unset DEFOGSHARE
+	
+	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before connect with client dir LOG STORAGE on $OGSERVERLOG : y/N "
+    [ $? == 0 ] && sh || echo " "
+	ogConnect $OGSERVERLOG $OGPROTOCOL $SRCOGLOG $DSTOGLOG
+	
+	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before connect with REPOSITORY STORAGE on $OGSERVERIMAGES : y/N "
+    [ $? == 0 ] && sh || echo " "
+	ogConnect $OGSERVERIMAGES $OGPROTOCOL $SRCOGIMAGES $DSTOGIMAGES ,ro
+	 
+
+	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before doing the postconfiguration: y/N "
+    [ $? == 0 ] && sh || echo " "
+	ogPostConfigureFS
+	setupcon -k
+
+	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before calling oginit with /etc/inittab: y/N "
+    [ $? == 0 ] && sh || echo " "
+    
+if [ "$oginit" ]
+then 
+	exec $oginit
+else
+	exec init
+fi
+
+
+
+
+
 }
--- a/includes/etc/inittab
+++ b/includes/etc/inittab
@ -1,5 +1,13 @@
 # This is run first except when booting in single-user mode
-tty1::respawn:/opt/opengnsys/etc/preinit.py
+#
+#::sysinit:/opt/opengnsys/etc/preinit/defaultTESTING.sh
+# /bin/sh invocations on selected ttys
+#
+# Start an "askfirst" shell on the console (whatever that may be)
+#::askfirst:/bin/sh
+# Start an "askfirst" shell on /dev/tty2-4
+#tty1::respawn:/sbin/getty 38400 tty1
+tty1::respawn:/opt/opengnsys/etc/preinit/default.sh
 tty2::respawn:/sbin/getty 38400 tty2
 tty3::respawn:/sbin/getty 38400 tty3
 tty4::respawn:/sbin/getty 38400 tty4
--- a/includes/etc/stunnel/menu.conf
+++ b/includes/etc/stunnel/menu.conf
@ -1,15 +0,0 @@
-setuid = stunnel4
-setgid = stunnel4
-pid = /var/run/stunnel4/menu.pid
-foreground = yes
-debug = info
-
-[menu]
-client = yes
-accept = 127.0.0.1:81
-connect = __OGCORE_IP__:__OGCORE_PORT__
-cert = /opt/opengnsys/etc/ogagent.crt
-key = /opt/opengnsys/etc/ogagent.key
-CAfile = /opt/opengnsys/etc/ca.crt
-requireCert = yes
-verifyChain = yes
--- a/includes/usr/bin/launch_browser
+++ b/includes/usr/bin/launch_browser
@ -1,99 +0,0 @@
-#!/bin/bash
-
-# Compatibilidad con los argumentos usados con el browser original: browser -qws http://google.com
-while getopts ":qwsDWX" opt ; do
-case $opt in
-    q) echo "Ignoring option: -q" ;;
-    w) echo "Ignoring option: -w" ;;
-    s) echo "Ignoring option: -s" ;;
-    D) BROWSER_DEBUG=1 ;;
-    W) DISABLE_WAYLAND=1 ;;
-    X) DISABLE_X11=1 ;;
-    esac
-done
-
-shift $(expr $OPTIND - 1)
-
-browser_args="$@"
-
-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"
-export QTWEBENGINE_CHROMIUM_FLAGS
-
-
-
-## sway
-mkdir -p $HOME/.config/sway
-echo "exec /usr/bin/OGBrowser --ignore-ssl-errors \"$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
-
-## i3
-mkdir -p $HOME/.config/i3
-echo "exec /usr/bin/OGBrowser --ignore-ssl-errors \"$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
-
-## xinitrc
-if [[ -z $DBUS_SESSION_BUS_ADDRESS ]]; then eval $(cat /proc/$(pidof OGAgent)/environ |sed -e 's/\x00/\x0a/g' |grep DBUS_SESSION_BUS_ADDRESS); fi
-echo "export DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS" > $HOME/.xinitrc
-echo "exec /usr/bin/i3"                                          >> $HOME/.xinitrc
-echo "exec /usr/bin/xterm"                                       >> $HOME/.xinitrc
-
-
-# Make sure libinput works
-/usr/bin/udevadm trigger
-
-
-## go
-rm -rf "/run/sway.started" "/run/x11.started"
-
-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" -a -z "$DISABLE_X11" ] ; 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
--- a/includes/usr/bin/setURL.py
+++ b/includes/usr/bin/setURL.py
@ -1,20 +0,0 @@
-#!/usr/bin/python3
-
-import sys
-import dbus
-
-if 2 != len(sys.argv):
-    sys.exit (1)
-
-dest = 'es.opengnsys.OGBrowser.browser'
-path = '/'
-interface = None
-method = 'setURL'
-signature = 's'
-url = sys.argv[1]
-
-b = dbus.SystemBus()
-try:
-    b.call_blocking (dest, path, interface, method, 's', [url])
-except Exception as e:
-    sys.exit (1)
--- 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 -- desactivado temporalmente
+  zfsutils-linux            # ogLive a partir de Ubuntu 16.04
  android-tools-adb         # ogLive a partir de Ubuntu 16.04
  android-tools-fastboot    # ogLive a partir de Ubuntu 16.04
  f2fs-tools
@ -108,11 +108,11 @@ 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 kitty-terminfo
+monitoring = htop ncdu bwbar bmon iftop ifstat dstat hdparm sdparm blktool testdisk

 networking = netpipes curl wget tftp-hpa dnsutils
  #trickle       # ubuntu noble: has no installation candidate
-  lighttpd ethtool ssmping tcpdump nmap arping ntpdate udpcast aria2 mktorrent #iptraf
+  lighttpd ethtool ssmping tcpdump nmap arping ntpdate ctorrent udpcast #iptraf

 testing =
  screen schroot xmlstarlet
@ -126,13 +126,9 @@ 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

-ogagent = stunnel4 filebeat
-
-ogbrowser = sway libinput-tools hwdata ogbrowser
-
-oggit = python3 python3-git python3-pyxattr python3-libarchive-c python3-pylibacl python3-pip python3-hivex opengnsys-libarchive-c python3-termcolor bsdextrautils opengnsys-pyblkid opengnsys-gitlib ntfs-3g-system-compression python3-tqdm
+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
+ 
--- a/mkoglive.py
+++ b/mkoglive.py
@ -75,10 +75,10 @@ def _initramfs_version (gitrelease, osrelease, curdir):

 def _copy_og_files (btrootfsimg, btrootfsmnt, osdistrib, oscodename):
    _mount_rootfs (btrootfsimg, btrootfsmnt)
-    builder        = '/tmp/opengnsys/oglive_builder'
-    og_shared      = '/tmp/opengnsys/shared'
-    ogrepo_ssh_key = '/tmp/opengnsys/ogrepo-ssh-key'
-    btog.copy_og_files (builder, og_shared, ogrepo_ssh_key, btrootfsmnt, osdistrib, oscodename)
+    builder   = '/tmp/opengnsys/oglive_builder'
+    og_shared = '/tmp/opengnsys/shared'
+    og_engine = '/tmp/opengnsys/engine'
+    btog.copy_og_files (builder, og_shared, og_engine, btrootfsmnt, osdistrib, oscodename)
    utils.umount (btrootfsmnt)

 def _chroot_tasks (cfgfile, curdir, osrelease, osarch):
@ -135,8 +135,7 @@ def _main (cfgfile, config, type_client):
    _debootstrap (btrootfsimg, btrootfsmnt, osarch, oscodename, oshttp)

    logger.info ('STAGE 2 - copy files to the rootfs')
-    today = datetime.datetime.now(datetime.timezone.utc).strftime ('%Y%m%d')
-    _initramfs_version (gitrelease+'_'+today, osrelease, curdir)
+    _initramfs_version (gitrelease, osrelease, curdir)
    _copy_og_files (btrootfsimg, btrootfsmnt, osdistrib, oscodename)

    logger.info ('STAGE 3 - perform tasks within the chroot')
@ -146,6 +145,7 @@ def _main (cfgfile, config, type_client):

    logger.info ('STAGE 4 - generate distribution files')
    pxepkg = _get_pxepkg()
+    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)