refs #1161 adds old browser

CHANGELOG.md

@@ -1,125 +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.14.0] - 2025-08-14
-
-### Added
-
-- Fix interfaceAdmin code
-- Rename parameters
-
-## [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

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/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

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 = '5G'
+        btvirtualdisksize = '3G'
     return bttargetdir, btrootfsimg, btrootfsmnt, btvirtualdisksize
 
 def GetOsInfo (type_client='host'):
@@ -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 3.1.1 basado en Ubuntu 24.04 y Kernel 6.8.
+    elif 'noble' == type_client: 	# ogLive 1.2.0-rc1 basado en Ubuntu 24.04 y Kernel 6.8.
             osdistrib='ubuntu'
             oscodename='noble'
             osrelease='6.8.0-31-generic'
@@ -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/')
@@ -243,9 +238,9 @@ def copy_og_files (builder, og_shared, ogrepo_ssh_key, ogclientmount, osdistrib,
     subprocess.run (f'rsync -aH {og_shared}/lib/qtlib/*     {ogclientmount}/usr/local/lib',     shell=True)
     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/')
+    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')

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 (' ')
+        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
 
     _oghook_deactivate()
 
@@ -44,9 +44,6 @@ 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
@@ -87,15 +84,15 @@ 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 (['unzip', '-o', 'savepart.zip', '-d', '/sbin/', 'spartl64.run', 'spartlnx.run'])
+        utils.run (['wget', '--quiet', 'http://damien.guibouret.free.fr/savepart.zip'])
+        utils.run (['unzip', '-o', 'savepart.zip', '-d', '/sbin/', 'spartl64.run'])
         utils.run (['mkdir', '/usr/share/doc/spartlnx'])
         utils.run (['unzip', '-j', '-o', 'savepart.zip', '-d', '/usr/share/doc/spartlnx/', 'doc/en/*'])
 
     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 ('..')
@@ -104,31 +101,12 @@ def boottoolsSoftwareCompile():
     os.environ['LC_ALL']   = env_lc_all
     os.environ['LANG']     = env_lang
 
-def updateCaCertificates():
-    print ('Updating CA trust Store', file=sys.stderr)
-    utils.run (['update-ca-certificates'])
-
 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')
-    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/*'):
@@ -152,7 +130,6 @@ 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)
@@ -165,11 +142,8 @@ if __name__ == '__main__':
         sys.exit (1)
     debconf_settings = config['General'].get ('debconf_settings')
 
-    updateCaCertificates()
-    setup_resolvconf1()
     boottoolsSoftwareInstall (args.osarch, args.osrelease)
     boottoolsSoftwareCompile()
     boottoolsPythonModules()
     boottoolsRemovePackages()
-    setup_resolvconf2()
     boottoolsInitrdGenerate (args.osrelease)

includes/etc/apt/sources.list.ubuntu

@@ -58,6 +58,3 @@ 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/opengnsys OSCODENAME main 
-

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>

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

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

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

includes/etc/initramfs-tools/modules

@@ -15,9 +15,6 @@
 #fbcon
 
 # Kernel 3.7+ video.
-virtio_gpu
-vmwgfx
-
 uvesafb
 
 # Generales

includes/etc/initramfs-tools/scripts/VERSION.txt

@@ -1 +1 @@
-OpenGnsys Client 3.13.0
+OpenGnsys Client 3.1.0

includes/etc/initramfs-tools/scripts/oginit

@@ -32,104 +32,123 @@
 #@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 " "
+	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 "qindel: calling ogChangeVideoResolution"
+	[ -n "$video" ] && ogChangeVideoResolution
+	echo "qindel: Checking OpenGnsys Environmnet: calling ogExportVarEnvironment"
+	log_success_msg "Checking OpenGnsys Environmnet"
+	ogExportVarEnvironment
+	
+	echo "qindel: stayin alive"
+	[ "$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
+		attempts=0
+		while !(ping -c 1 $oglive &> /dev/null)
+		do
+			attempts=$((attempts+1))
+			echo "Attempt $attempts: Waiting for network connection... attempting to ping $oglive"
+			ogConfigureNetworking
+		done
+		echo "Connection established after $attempts attempts."
+	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
+
+
+
+
+
 }

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

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

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

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)

includes/usr/local/share/ca-certificates/GEANT_OV_RSA_CA_4.crt

@@ -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-----

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,8 @@ 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

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)