Modify jenkinsfile to upload packages

CHANGELOG.md

@@ -1,343 +1,12 @@
-# Changelog
+# Changelog 
 
-All notable changes to this project will be documented in this file.
+## [0.1.1] - 2025-02-28
 
-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).
-
-## [0.18.2] - 2025-06-19
-
-### Fixed
-
-- Accept None as partition type
-
-## [0.18.1] - 2025-06-18
-
-### Fixed
-
-- Look for grub.cfg in two places rather than one
-
-## [0.18.0] - 2025-06-16
-
-### Added
-
-- Added scripts and libs for oggit
-
-## [0.17.0] - 2025-06-16
-
-### Changed
-
-- Removed useless warning about /dev/loop0
-- Fix windows EFI booting, and a typo
-
-## [0.16.0] - 2025-06-12
-
-### Changed
-
-- Gave some care to the "Custom" scripts
-
-## [0.15.3] - 2025-06-12
-
-### Fixed
-
-- Create missing dir
-
-## [0.15.2] - 2025-06-11
-
-### Fixed
-
-- Fixed a condition check
-
-## [0.15.1] - 2025-06-11
-
-### Fixed
-
-- Add a missing "import"
-- Fix retrieving windows version from the registry
-- Fix bug while building the "Part-01-01" string
-- Removed obsolete unused "bootOS" scripts (with a capital "S")
-
-## [0.15.0] - 2025-06-10
-
-### Changed
-
-- Remove opengnsys bash functions from the agent's environment
-
-## [0.14.2] - 2025-06-09
-
-### Fixed
-
-- Get rc of bash pipelines in ProtocolLib
-
-## [0.14.1] - 2025-06-07
-
-### Fixed
-
-- Fixed rc management in deployImage.py
-
-## [0.14.0] - 2025-06-07
-
-### Changed
-
-- Read $ogusetls and $ogverifytls from the environment and configure stunnel accordingly
-
-## [0.13.9] - 2025-06-04
-
-### Fixed
-
-- Copy grub.cfg so that grub finds the config upon boot
-
-## [0.13.8] - 2025-06-03
-
-### Fixed
-
-- Paid attention to return codes between python (True for success) and shell (0 for success)
-
-## [0.13.7] - 2025-06-02
-
-### Fixed
-
-- Fixed management of the "multicast session" parameter
-
-## [0.13.6] - 2025-06-02
-
-### Fixed
-
-- Fixed variable name in restoreImage.py
-
-## [0.13.5] - 2025-05-30
-
-### Fixed
-
-- Return a true value from the unicast/multicast methods
-- Fully qualify a method call
-
-## [0.13.4] - 2025-05-28
-
-### Changed
-
-- Show sgdisk output
-
-## [0.13.3] - 2025-05-28
-
-### Fixed
-
-- unlink() only existing files
-
-## [0.13.2] - 2025-05-28
-
-### Changed
-
-- Point urlMenu back to the localhost stunnel
-
-## [0.13.1] - 2025-05-21
-
-### Changed
-
-- Make dbus envvar available to the agent
-
-## [0.13.0] - 2025-05-19
-
-### Added
-
-- Run dbus
-
-## [0.12.0] - 2025-05-18
-
-### Changed
-
-- no tls for the urlmenu either
-
-## [0.11.0] - 2025-05-18
-
-### Added
-
-- Run stunnel and point the browser to it
-
-## [0.10.0] - 2025-05-14
-
-### Changed
-
-- Run the new browser
-
-## [0.9.0] - 2025-05-09
-
-### Added
-
-- Use zstd when creating and restoring images
-
-## [0.8.4] - 2025-05-09
-
-### Added
-
-- When restoring an image, include the image name in the ogagent configuration file
-
-## [0.8.3] - 2025-05-08
-
-### Fixed
-
-- Have ogNvramAddEntry() handle EFI entries with spaces in them
-
-## [0.8.2] - 2025-05-07
-
-### Changed
-
-- Have Configurar.py ignore the tch parameter, take cache size from the definition of the cache partition
-
-## [0.8.1] - 2025-05-07
-
-### Fixed
-
-- Gracefully handle error in ogBoot() when not finding /boot partition in target's fstab
-
-## [0.8.0] - 2025-04-23
-
-### Added
-
-- Have the oglive agent send /stopped on poweroff or restart
-
-## [0.7.2] - 2025-04-21
-
-### Fixed
-
-- Have the partitioning functions return a meaningful rc
-
-## [0.7.1] - 2025-04-15
-
-### Fixed
-
-- getConfiguration.py: don't fail if NTFS filesystems are mounted ro
-
-## [0.7.0] - 2025-04-15
-
-### Removed
-
-- Removed references to ogGlobals.OGLOG in python code
-
-## [0.6.1] - 2025-04-15
-
-### Fixed
-
-- Fixed capturing of partclone output and management of return value
-
-## [0.6.0] - 2025-04-15
-
-### Changed
-
-- ogGetIpAddress() is no longer required in ogGlobals--move it back into NetLib
-
-## [0.5.0] - 2025-04-15
-
-### Changed
-
-- Log to /var/log/clone-engine.log and clone-engine.json.log
-
-## [0.4.1] - 2025-04-10
-
-### Fixed
-
-- restoreImage.py: return negated rc to the shell
-
-## [0.4.0] - 2025-04-10
-
-### Changed
-
-- Make /opt/opengnsys writable in clients, just like it used to be
-
-## [0.3.6] - 2025-04-09
-
-### Fixed
-
-- Fixed ogReduceFs
-
-## [0.3.5] - 2025-04-09
-
-### Fixed
-
-- Fixed syntax
-
-## [0.3.4] - 2025-04-09
-
-### Fixed
-
-- Fixed usage of ogEcho in FileSystemLib
-
-## [0.3.3] - 2025-04-09
-
-### Fixed
-
-- Kill coproc'ed browser in all execution branches in Configurar.py
-
-## [0.3.2] - 2025-04-07
-
-### Fixed
-
-- Handle invalid number of arguments pass to functions/ogCopyFile
-
-## [0.3.1] - 2025-04-03
-
-### Fixed
-
-- Fixed invocation to ogCheckIpAddress in interfaceAdm/CrearImagen.py
-
-## [0.3.0] - 2025-04-03
-
-### Removed
-
-- Removed burg and rsync 3.1
-
-## [0.2.6] - 2025-03-31
-
-### Fixed
-
-- Restore qt4 browser
-
-## [0.2.5] - 2025-03-31
-
-### Fixed
-
-- Don't require protoopts in interfaceAdm/RestaurarImagen.py
-
-## [0.2.4] - 2025-03-28
-
-### Removed
-
-- Removed burg, QT4 stuff, rsync 3.1 and the old browser
-
-## [0.2.3] - 2025-03-28
-
-### Fixed
-
-- Fixed some errors in Configurar.py, ogCreateCache, ogCreatePartitions and initCache.py
-
-## [0.2.2] - 2025-03-26
-
-### Fixed
-
-- Prevent EjecutarScript.py from capturing the output of the script
-
-## [0.2.1] - 2025-03-26
-
-### Fixed
-
-- Run scripts with bash to avoid errno 8 "Exec format error"
-
-## [0.2.0] - 2025-03-25
-
-### Added
-
-- getConfiguration.py now collects the firmware type
-- Configurar.py now creates partition tables of the right type (MSDOS/GPT) for each machine
-
-## [0.1.1] - 2025-03-19
-
-### Added
-
-- Missing functions in BootLib
-- Some interfaceAdm python scripts
+### Changed - 2025-03-19
 
 ## [0.1.0] - 2025-02-28
 
-### Added
+### Addded
 
 - Merge pull request 'Include all client files, build debian package' (#2) from deb-package into main
+

Jenkins/Jenkinsfile-deb-pkg

@@ -19,7 +19,7 @@ pipeline {
         stage('Prepare Workspace') {
             steps {
                 script {
-                    env.BUILD_DIR = "${WORKSPACE}/ogclient"
+                    env.BUILD_DIR = "${WORKSPACE}/oggui"
                     sh "mkdir -p ${env.BUILD_DIR}"
                 }
             }
@@ -48,22 +48,16 @@ pipeline {
                 }
             }
         }
-        stage('Generate Changelog (Nightly)'){
-            when {
-                branch 'main'
-            }
-            steps {
-                script {
-                    def devName = params.DEV_NAME ? params.DEV_NAME : env.DEFAULT_DEV_NAME
-                    def devEmail = params.DEV_EMAIL ? params.DEV_EMAIL : env.DEFAULT_DEV_EMAIL
-                    generateDebianChangelog(env.BUILD_DIR, devName, devEmail,"nightly")
-                }
-            }
-        }
+
         stage('Build') {
             steps {
-                script {
-                    construirPaquete(env.BUILD_DIR, "../artifacts", "172.17.8.68", "/var/tmp/opengnsys/debian-repo/ogclient")
+                dir("${env.BUILD_DIR}") {
+                    sh '''
+                    dpkg-buildpackage -us -uc
+                    mkdir -p ../artifacts && mv ../*.deb ../*.changes ../*.buildinfo ../artifacts/
+                    ssh aptly@172.17.8.68 "rm -rf /var/tmp/opengnsys/debian-repo/ogclient && mkdir -p /var/tmp/opengnsys/debian-repo/ogclient"
+                    scp -r ../artifacts/* aptly@172.17.8.68:/var/tmp/opengnsys/debian-repo/ogclient
+                    '''
                 }
             }
         }
@@ -75,24 +69,7 @@ pipeline {
             }
             agent { label 'debian-repo' }
             steps {
-                script {
-                    // Construir el patrón de versión esperado en el nombre del paquete
-                    def versionPattern = "${env.TAG_NAME}-${env.BUILD_NUMBER}"
-                    publicarEnAptly('/var/tmp/opengnsys/debian-repo/ogclient', 'opengnsys-devel', versionPattern)
-                }
-            }
-        }
-        stage ('Publish to Debian Repository (Nightly)') {
-            when {
-                branch 'main'
-            }
-            agent { label 'debian-repo' }
-            steps {
-               script {
-                    // Construir el patrón de versión esperado en el nombre del paquete
-                    def versionPattern = "-${env.BUILD_NUMBER}~nightly"
-                    publicarEnAptly('/var/tmp/opengnsys/debian-repo/ogclient', 'nightly', versionPattern)
-                }
+                sh "aptly repo add opengnsys-devel /var/tmp/opengnsys/debian-repo/ogclient/*.deb"
             }
         }
     }

debian/ogclient.postinst

@@ -23,7 +23,13 @@ case "$1" in
             cp -a "$OLD_FILE" "$NEW_FILE"
 
             # Append our configuration
-            echo "include = /etc/samba/smb-ogclient.conf" >> "$OLD_FILE"
+            echo "include = /etc/samba/smb-ogclient.conf" >> "$NEW_FILE"
+
+            # Use ucf to handle the file update
+            ucf --debconf-ok "$NEW_FILE" "$OLD_FILE"
+
+            # Clean up
+            rm -f "$NEW_FILE"
 
             # Reload Samba
             if command -v systemctl >/dev/null 2>&1; then
@@ -42,8 +48,6 @@ case "$1" in
     ;;
 esac
 
-chown -R opengnsys:opengnsys /opt/opengnsys/ogclient
-chown -R opengnsys:opengnsys /opt/opengnsys/ogclient_log
 #DEBHELPER#
 
 exit 0

debian/ogclient.preinst

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Asegurarse de que el usuario exista
-USER="opengnsys"
-HOME_DIR="/opt/opengnsys"
-if id "$USER" &>/dev/null; then
-    echo "El usuario $USER ya existe."
-else
-    echo "Creando el usuario $USER con home en $HOME_DIR."
-    useradd -m -d "$HOME_DIR" -s /bin/bash "$USER"
-fi
-
-exit 0

etc/samba/smb-ogclient.conf

@@ -1,7 +1,7 @@
 [ogclient]
    comment = OpenGnsys Client
    browseable = no
-   writeable = yes 
+   writeable = no
    locking = no
    path = /opt/opengnsys/ogclient
    guest ok = no

ogclient/etc/init/default.sh

@@ -21,26 +21,20 @@ echo "${MSG_LAUNCHCLIENT:-.}"
 if [ -f "/usr/share/OGAgent/opengnsys/linux/OGAgentService.py" -a "$ogstatus" != "offline"  ]; then
     # Ejecutar servicio cliente.
     cd /usr/share/OGAgent
-    export OGAGENTCFG_OGCORE_IP=$ogcore
+    export OGAGENTCFG_OGCORE_IP=$ogcore   
     export OGAGENTCFG_OGLOG_IP=$oglog
-    export OGAGENTCFG_URLMENU_SCHEME=http
-    export OGAGENTCFG_URLMENU_IP=127.0.0.1
-    export OGAGENTCFG_URLMENU_PORT=81
-    (
-        ## remove bash functions and some OG vars from the agent's environment
-        unset -f $(declare -F |awk     '/og[A-Z]|NT[A-Z]/ { print $3 }')
-        unset    $(declare    |awk -F= '/^MSG_|^OG_ERR_/  { print $1 }')
-        python3 -m opengnsys.linux.OGAgentService fg
-    )
+    export OGAGENTCFG_URLMENU_IP=$ogcore
+    python3 -m opengnsys.linux.OGAgentService fg
 else
     for FILE in index $OGGROUP $(ogGetIpAddress)
     do
         [ -f $OGCAC/menus/$FILE.html ] && OGMENU="$OGCAC/menus/$FILE.html"
     done
-    $OPENGNSYS/bin/launch_browser $OGMENU
+    echo "exec /usr/bin/OGBrowser $OGMENU" > /home/root/
+    /usr/bin/OGBrowser -qws $OGMENU
 fi
 
 # Si fallo en cliente y modo "admin", cargar shell; si no, salir.
 if [ "$ogactiveadmin" == "true" ]; then
     bash
-fi
+fi

ogclient/etc/preinit/default.sh

@@ -6,7 +6,7 @@ source /opt/opengnsys/etc/preinit/loadenviron.sh
 
 # Scripts de inicio.
 for f in fileslinks loadmodules metadevs mountrepo poweroff otherservices; do
-    source $OGETC/preinit/$f.sh
+    $OGETC/preinit/$f.sh
 done
 unset f
 

ogclient/etc/preinit/otherservices.sh

@@ -13,58 +13,6 @@ ogIsEfiActive && mount -t efivarfs none /sys/firmware/efi/efivars
 # Lanzar servicios complementarios del cliente.
 echo "${MSG_OTHERSERVICES:-.}"
 
-# stunnel start
-cat >/etc/stunnel/menu.conf <<__EOF__
-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:8443
-__EOF__
-if [[ true == "$ogusetls" ]]; then
-    if [[ true == "$ogverifytls" ]]; then
-        ## use tls and verify
-        cat >>/etc/stunnel/menu.conf <<__EOF__
-cert = /opt/opengnsys/etc/ogagent.crt
-key = /opt/opengnsys/etc/ogagent.key
-CAfile = /opt/opengnsys/etc/ca.crt
-requireCert = yes
-verifyChain = yes
-__EOF__
-    else
-        ## use tls but not verify
-        cat >>/etc/stunnel/menu.conf <<__EOF__
-cert = /opt/opengnsys/etc/ogagent.crt
-key = /opt/opengnsys/etc/ogagent.key
-CAfile = /opt/opengnsys/etc/ca.crt
-requireCert = no
-verifyChain = no
-__EOF__
-    fi
-else
-    ## don't use tls
-    cat >>/etc/stunnel/menu.conf <<__EOF__
-requireCert = no
-verifyChain = no
-__EOF__
-fi
-mkdir -p /var/run/stunnel4; chown stunnel4:stunnel4 /var/run/stunnel4
-stunnel /etc/stunnel/menu.conf &>/var/log/stunnel4/menu.log &
-# stunnel end
-
-# Iniciar dbus
-if [ -e /etc/dbus-1/system.d/ogbrowser.conf ]; then
-    mkdir -p /run/dbus
-    DBUS_SESSION_BUS_ADDRESS=$(dbus-daemon --print-address --system --nosyslog)
-    export DBUS_SESSION_BUS_ADDRESS
-    dbus-monitor --system &>/var/log/dbus-monitor.log &
-fi
-
 # Iniciar rsyslog, si es necesario.
 [ -S /dev/log ] || service rsyslog start
 

ogclient/functions/ogCopyFile

@@ -55,9 +55,6 @@ elif 6 == len (sys.argv):
         args = parser.parse_args()
         src = { 'container': args.src_container, 'file': args.src_file }
         dst = { 'disk': args.dst_disk, 'par': args.dst_par, 'file': args.dst_file }
-else:
-    ogHelp ('ogCopyFile', 'ogCopyFile [ str_repo | int_ndisk int_npartition ] path_source [ str_repo | int_ndisk int_npartition ] path_target', ['ogCopyFile REPO newfile.txt 1 2 /tmp/newfile.txt'])
-    sys.exit (1)
 
 ret = ogCopyFile (src, dst)
 if ret is not None:

ogclient/interfaceAdm/Apagar.py

@@ -2,9 +2,6 @@
 
 import os
 import sys
-import time
 
-os.system ('pkill -f OGAgent')
-time.sleep (3)
 os.system ('poweroff')
 sys.exit (0)

ogclient/interfaceAdm/Configurar.py

@@ -9,7 +9,6 @@ import SystemLib
 import CacheLib
 import FileSystemLib
 import DiskLib
-import InventoryLib
 
 #Load engine configurator from engine.cfg file.
 #Carga el configurador del engine desde el fichero engine.cfg
@@ -35,6 +34,10 @@ prog = os.path.basename(__name__)
 # El parámetro $2 es el que aporta toda la información y el $1 se queda obsoleto
 # Formato de entrada:
 #		dis=Número de disco
+#		*=caracter de separación
+#		che=Vale 0 o 1
+#		*=caracter de separación
+#		$tch=tamaño cache
 #		!= caracter de separación
 #
 #   Y un numero indeterminado de cadenas del tipo siguuenteseparadas por el caracter '$':
@@ -43,7 +46,7 @@ prog = os.path.basename(__name__)
 #____________________________________________________________________
 
 # Captura de parámetros (se ignora el 1er parámetro y se eliminan espacios y tabuladores).
-#param='dis=1!par=1*cpt=NTFS*sfi=NTFS*tam=11000000*ope=0%'
+#param='dis=1*che=0*tch=70000000!par=1*cpt=NTFS*sfi=NTFS*tam=11000000*ope=0%'
 #param = ''.join(sys.argv[2:]).replace(' ', '').replace('\t', '')
 param = sys.argv[2]
 
@@ -58,21 +61,23 @@ sparam = tbprm[1]  # Partitioning and formatting parameters
 # Toma valores de disco y caché, separados por "*".
 # Los valores están en las variables $dis: disco, $che: existe cache (1, 0), $tch: Tamaño de la cache.
 tbprm = pparam.split ('*')
-dis = tch = None
+dis = ptt = tch = None
 for item in tbprm:
     if '=' not in item: continue
 
     k, v = item.split ('=', 1)
-    if k not in ['dis']:
+    if k not in ['dis', 'tch', 'ptt']:                      ## 'ptt' added, unused 'che' removed
         print (f'ignoring unknown disk parameter ({k})')
         continue
 
-    if 'dis' == k: dis = int (v)
+    if   'dis' == k: dis = int (v)
+    elif 'ptt' == k: ptt = v
+    elif 'tch' == k: tch = v
 
 # Error si no se define el parámetro de disco (dis).
-if dis is None:
-    coproc.kill()
-    sys.exit (ogGlobals.OG_ERR_FORMAT)
+if dis is None: sys.exit (ogGlobals.OG_ERR_FORMAT)
+if ptt is None: ptt = 'MSDOS'
+if tch is None: tch = '0'
 
 # Toma valores de distribución de particiones, separados por "%".
 tbp = []  # Valores de configuración (parámetros para ogCreatePartitions)
@@ -107,14 +112,10 @@ for item in tbprm:
     if tam is None: missing_params.append ('tam')
     if missing_params:
         print (f'partition data ({item}) missing required parameters ({' '.join (missing_params)})')
-        coproc.kill()
         sys.exit (1)
 
         # Componer datos de particionado.
-    if 'CACHE' == cpt:
-        tch = tam
-    else:
-        tbp.append (f'{cpt}:{tam}')
+    if 'CACHE' != cpt: tbp.append (f'{cpt}:{tam}')
     if ope:
         # Si se activa operación de formatear, componer datos de formateo.
         if cpt not in ['EMPTY', 'EXTENDED', 'LINUX-LVM', 'LVM', 'ZPOOL']:
@@ -122,9 +123,6 @@ for item in tbprm:
         # Obtener la partición mayor.
     if par > maxp: maxp = par
 
-if tch is None:
-    tch = '0'
-
 #____________________________________________________
 #
 # Proceso
@@ -140,21 +138,18 @@ CacheLib.ogUnmountCache()
 
 # Elimina la tabla de particiones
 cur_ptt = DiskLib.ogGetPartitionTableType (dis)
-ptt = 'GPT' if InventoryLib.ogIsEfiActive() else 'MSDOS'
 if not cur_ptt or ptt != cur_ptt:
     DiskLib.ogDeletePartitionTable (dis)
     SystemLib.ogExecAndLog ('command', DiskLib.ogUpdatePartitionTable)
+
+        # Crea tabla de particiones MSDOS (NOTA: adaptar para tablas GPT).
     DiskLib.ogCreatePartitionTable (dis, ptt)
 
 # Inicia la cache.
 if 'CACHE' in sparam:
     SystemLib.ogEcho (['session', 'log'], None, f'[30] {ogGlobals.lang.MSG_HELP_ogCreateCache}')
     SystemLib.ogEcho (['session', 'log'], None, f'   initCache {tch}')
-    rc = SystemLib.ogExecAndLog ('command', CacheLib.initCache, tch)
-    if not rc:
-        SystemLib.ogRaiseError (['log', 'session'], ogGlobals.OG_ERR_CACHE, f'initCache failed')
-        coproc.kill()
-        sys.exit (1)
+    SystemLib.ogExecAndLog ('command', CacheLib.initCache, tch)
 
 # Definir particionado.
 SystemLib.ogEcho (['session', 'log'], None, f'[50] {ogGlobals.lang.MSG_HELP_ogCreatePartitions}')

ogclient/interfaceAdm/CrearImagen.py

@@ -66,7 +66,7 @@ repo = arg_repo
 if not repo: repo = 'REPO'
 if repo == ogGetIpAddress(): repo = 'CACHE'
 # Si es una ip y es distinta a la del recurso samba cambiamos de REPO.
-if 'REPO' == repo or ogCheckIpAddress (repo):
+if 'REPO' == repo or StringLib.ogCheckIpAddress (repo):
         # Si falla el cambio -> salimos con error repositorio no valido
     if not ogChangeRepo (repo):
         ogRaiseError ([], ogGlobals.OG_ERR_NOTFOUND, repo)

ogclient/interfaceAdm/CrearImagenGit.py

@@ -1,38 +0,0 @@
-#!/usr/bin/env python3
-import os
-import subprocess
-import sys
-import time
-
-
-sys.path.insert(0, "/opt/oglive/rootfs/opt/opengnsys/lib/python3/")
-sys.path.insert(0, "/opt/opengnsys/interfaceAdm/git/")
-sys.path.insert(0, "/opt/opengnsys/ogrepository/oggit/lib/")
-
-import NetLib
-import ogGlobals
-import SystemLib
-
-
-from gitlib import OpengnsysGitLibrary, NTFSImplementation
-
-
-def create_image(disk_num, partition_num, repo, image_name):
-
-    ntfs_impl = NTFSImplementation.NTFS3G
-    og_git = OpengnsysGitLibrary(ntfs_implementation = ntfs_impl)
-    device = og_git._runBashFunction("ogDiskToDev", [str(disk_num), str(partition_num)])
-    og_git.initRepo(device, image_name)
-
-def main():
-    if len(sys.argv) != 6:
-        sys.exit(SystemLib.ogRaiseError(OG_ERR_FORMAT, "Incorrect number of arguments"))
-
-    disk_num, partition_num, image_name, repo, tag = sys.argv[1:6]
-
-    retval = create_image(disk_num, partition_num, repo, image_name)
-
-    sys.exit(retval)
-
-if __name__ == "__main__":
-    main()

ogclient/interfaceAdm/EjecutarScript.py

@@ -34,7 +34,7 @@ with open (ogGlobals.OGLOGFILE, 'a') as logfd:
 
 os.chmod (script_path, 0o755)
 # Si mandamos la salida a OGLOGCOMMAND reescribimos lo que manda el comando.
-RETVAL = subprocess.run (['bash', script_path]).returncode
+RETVAL = subprocess.run (script_path, capture_output=True, text=True).returncode
 
 
 TIME = time.time() - TIME1

ogclient/interfaceAdm/Reiniciar.py

@@ -2,9 +2,6 @@
 
 import os
 import sys
-import time
 
-os.system ('pkill -f OGAgent')
-time.sleep (3)
 os.system ('reboot')
 sys.exit (0)

ogclient/interfaceAdm/RestaurarImagen.py

@@ -19,11 +19,11 @@ import ogGlobals
 
 if __name__ == '__main__':
     prog = sys.argv[0]
-    if len (sys.argv) < 6:
-        print (f'Usage: {prog} <disk> <partition> <image_name> <repo_ip> <protocol> [protocol_options] [additional_args...]')
+    if len (sys.argv) < 7:
+        print (f'Usage: {prog} <disk> <partition> <image_name> <repo_ip> <protocol> <protocol_options> [additional_args...]')
         sys.exit (1)
 
-    disk, par, imgname, repo, proto, *extra = sys.argv[1:]
+    disk, par, imgname, repo, proto, protoopt, *extra = sys.argv[1:]
 
-    rc = subprocess.run ([f'{ogGlobals.OGSCRIPTS}/deployImage.py', repo, imgname, disk, par, proto] + extra).returncode
+    rc = subprocess.run ([f'{ogGlobals.OGSCRIPTS}/deployImage.py', repo, imgname, disk, par, proto, protoopt] + extra).returncode
     sys.exit (rc)

ogclient/interfaceAdm/RestaurarImagenGit.py

@@ -1,32 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import subprocess
-
-
-sys.path.insert(0, "/opt/oglive/rootfs/opt/opengnsys/lib/python3/")
-sys.path.insert(0, "/opt/opengnsys/interfaceAdm/git/")
-sys.path.insert(0, "/opt/opengnsys/ogrepository/oggit/lib/")
-
-import NetLib
-import ogGlobals
-import SystemLib
-from gitlib import OpengnsysGitLibrary, NTFSImplementation
-
-if __name__ == "__main__":
-    if len(sys.argv) < 4:
-        print("Usage: python RestaurarImagenGit.py <disk> <partition> <repo> <boot_device>")
-        sys.exit(1)
-
-    disk = sys.argv[1]
-    partition = sys.argv[2]
-    repo = sys.argv[3]
-    boot_device = sys.argv[4]
-
-    ntfs_impl = NTFSImplementation.NTFS3G
-    og_git = OpengnsysGitLibrary(ntfs_implementation = ntfs_impl)
-
-    device = og_git._runBashFunction("ogDiskToDev", [str(disk), str(partition)])
-
-    og_git.cloneRepo(repo, device, boot_device)
-
-

ogclient/interfaceAdm/getConfiguration.py

@@ -1,78 +1,80 @@
-#!/usr/bin/python3
-
+#!/usr/bin/env python3
 import os
-import glob
 import subprocess
 
-from InventoryLib import ogGetSerialNumber, ogGetOsVersion, ogIsEfiActive
-from DiskLib import ogDiskToDev, ogGetPartitionsNumber, ogGetPartitionTableType, ogGetDiskSize, ogGetPartitionId, ogGetPartitionSize
-from FileSystemLib import ogMount, ogGetMountPoint, ogGetFsType
+def run_command(command):
+    result = subprocess.run(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    return result.stdout.decode().strip()
 
-ser = ogGetSerialNumber()
-fwt = 'UEFI' if ogIsEfiActive() else 'BIOS'
-print (f'ser={ser}\nfwt={fwt}')
+def main():
+    # No registrar los errores.
+    os.environ["DEBUG"] = "no"
+
+    ser = run_command("ogGetSerialNumber")
+    cfg = ""
+    disks = int(run_command("ogDiskToDev | wc -w"))
+
+    for dsk in range(1, disks + 1):
+        particiones = run_command(f"ogGetPartitionsNumber {dsk}")
+        particiones = int(particiones) if particiones else 0
+        ptt = run_command(f"ogGetPartitionTableType {dsk}")
 
-disks = len (ogDiskToDev())
-if disks:
-    for dsk in range (1, disks+1):
-        # Tipo de tabla de particiones: 1=MSDOS, 2=GPT
-        ptt = ogGetPartitionTableType (dsk)
         ptt_map = {
-            'MSDOS': 1,
-            'GPT':   2,
-            'LVM':   3,
-            'ZPOOL': 4,
+            "MSDOS": 1,
+            "GPT": 2,
+            "LVM": 3,
+            "ZPOOL": 4
         }
-        ptt = ptt_map.get (ptt, 0)
+        ptt = ptt_map.get(ptt, 0)
 
-        # Información de disco (partición 0)
-        s = ogGetDiskSize (dsk)
-        print (f'disk={dsk}\tpar=0\tcpt={ptt}\tfsi=\tsoi=\ttam={s}\tuso=0')
+        cfg += f"{dsk}:0:{ptt}:::{run_command(f'ogGetDiskSize {dsk}')}:0;"
 
-        particiones = ogGetPartitionsNumber (dsk)
-        particiones = int (particiones) if particiones else 0
-        for par in range (1, particiones+1):
-            # Código del identificador de tipo de partición
-            cod = ogGetPartitionId (dsk, par)
+        for par in range(1, particiones + 1):
+            cod = run_command(f"ogGetPartitionId {dsk} {par} 2>/dev/null")
+            fsi = run_command(f"getFsType {dsk} {par} 2>/dev/null") or "EMPTY"
+            tam = run_command(f"ogGetPartitionSize {dsk} {par} 2>/dev/null") or "0"
+            soi = ""
+            uso = 0
 
-            # Tipo del sistema de ficheros
-            fsi = ogGetFsType (dsk, par)
-            if not fsi: fsi = 'EMPTY'
-
-            # Tamaño de la particón
-            tam = ogGetPartitionSize (dsk, par)
-            if not tam: tam = '0'
-
-            # Sistema operativo instalado y porcentaje de uso
-            soi = ''
-            uso = '0'
-            if fsi not in ['', 'EMPTY', 'LINUX-SWAP', 'LINUX-LVM', 'ZVOL']:
-                if ogMount (dsk, par):
-                    soi = ogGetOsVersion (dsk, par)
-                    # Hacer un 2º intento para algunos casos especiales.
+            if fsi not in ["", "EMPTY", "LINUX-SWAP", "LINUX-LVM", "ZVOL"]:
+                if run_command(f"ogMount {dsk} {par} 2>/dev/null"):
+                    soi = run_command(f"getOsVersion {dsk} {par} 2>/dev/null").split(":")[1]
                     if not soi:
-                        soi = ogGetOsVersion (dsk, par)
-                        if not soi: soi = ''
-                    if soi: soi = soi.split (':')[1]
-                    # Sistema de archivos para datos (sistema operativo "DATA")
-                    if not soi and fsi not in ['EMPTY', 'CACHE']:
-                        soi = 'DATA'
-                    mntpt = ogGetMountPoint (dsk, par)
-                    uso = subprocess.run (['df', mntpt], capture_output=True, text=True).stdout.splitlines()[-1].split()[4].replace ('%', '')
-                    if not uso: uso = '0'
+                        soi = run_command(f"getOsVersion {dsk} {par} 2>/dev/null").split(":")[1]
+                    if not soi and fsi not in ["EMPTY", "CACHE"]:
+                        soi = "DATA"
+                    uso = int(run_command(f"df $(ogGetMountPoint {dsk} {par}) | awk '{{getline; printf \"%d\",$5}}'") or 0)
                 else:
-                    soi = ''
-                    uso = '0'
+                    soi = ""
+                    uso = 0
 
-            print (f'disk={dsk}\tpar={par}\tcpt={cod}\tfsi={fsi}\tsoi={soi}\ttam={tam}\tuso={uso}')
-else:
-    print ('disk=1\tpar=0\tcpt=0\tfsi=\tsoi=\ttam=0\tuso=0')
+            cfg += f"{dsk}:{par}:{cod}:{fsi}:{soi}:{tam}:{uso};"
 
-# Crear el menú por defecto a partir del fichero generado (no dar ninguna salida).
-# requiere /tmp/getconfig pero este script ya no lo crea
-#subprocess.run ([f'{ogGlobals.OGSCRIPTS}/generateMenuDefault'])
+    if not cfg:
+        cfg = "1:0:0:::0;"
 
-# Borramos marcas de arranque de Windows
-for f in glob.glob ('/mnt/*/ogboot.*') + glob.glob ('/mnt/*/*/ogboot.*'):
-    try: os.unlink (f)
-    except: pass
+    cfgfile = "/tmp/getconfig"
+    with open(cfgfile, "w") as f:
+        f.write(f"{ser + ';' if ser else ''}{cfg}")
+
+    run_command("generateMenuDefault &>/dev/null")
+
+    with open(cfgfile, "r") as f:
+        data = f.read()
+
+    lines = data.split(";")
+    for line in lines:
+        if line:
+            parts = line.split(":")
+            if len(parts) == 1:
+                print(f"ser={parts[0]}")
+            else:
+                print(f"disk={parts[0]}\tpar={parts[1]}\tcpt={parts[2]}\tfsi={parts[3]}\tsoi={parts[4]}\ttam={parts[5]}\tuso={parts[6]}")
+
+    run_command("rm -f /mnt/*/ogboot.* /mnt/*/*/ogboot.*")
+
+    # Volver a registrar los errores.
+    os.environ.pop("DEBUG", None)
+
+if __name__ == "__main__":
+    main()

ogclient/interfaceAdm/getIpAddress.py

@@ -1,5 +1,10 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
+import socket
 
-from NetLib import ogGetIpAddress
+def get_ip_address():
+    hostname = socket.gethostname()
+    ip_address = socket.gethostbyname(hostname)
+    return ip_address
 
-print (ogGetIpAddress())
+if __name__ == "__main__":
+    print(get_ip_address())

ogclient/lib/burg/themes/OpenGnsys/extended

@@ -0,0 +1,79 @@
+include "theme"
+
+screen {
+  background = "$$/background.png"
+
+  panel {
+    halign = center
+    attach_vcenter = 0
+    height = 19
+    # Flip so the cursor defaults to the main menu
+    direction = bottom_to_top
+
+    ### Main Menu ###
+    panel {
+      height = 15
+      max_width = 120
+      margin_top = 1
+      class = container-body
+      # No need for a min width and centering panel because extended width > min width
+
+      direction = left_to_right
+      anchor = 1
+      id = __menu__
+    }
+
+    panel {
+      height = 4
+      width = 100%
+      class = container-title
+
+      direction = left_to_right
+
+      image {
+        image = "$$/images/txt-select.png"
+        attach_top = 0
+        attach_left = 0
+      }
+
+      ### Tools Menu ###
+      image {
+        attach_right = 2
+        image = "$$/images/button-tools.png:$$/images/button-tools-hover.png"
+        command = "menu_popup tools_menu"
+      }
+    }
+  }
+
+  ### Progress Bar ###
+  panel {
+    halign = center
+    attach_vcenter = 20
+    width = 80
+    class = progressbar-background
+    id = __timeout__
+
+    progressbar { }
+  }
+}
+
+template_menuitem {
+  panel {
+    width = 40
+    height = 12
+
+    parameters = "class=image.class:title=panel.text.text"
+
+    image {
+      attach_vcenter = 0
+      attach_hcenter = 0
+    }
+
+    panel {
+      attach_vcenter = 0
+      attach_hcenter = 0
+      class = text-line
+      text { font = "Helvetica Regular 22" }
+    }
+  }
+}

ogclient/lib/burg/themes/OpenGnsys/icons/icons

@@ -0,0 +1,21 @@
++class
+{
+  -opengnsys { image = "$$/normal_opengnsys.png:$$/hover_opengnsys.png" }
+  -windows10 { image = "$$/normal_windows10.png:$$/hover_windows10.png" }
+  -windows7 { image = "$$/normal_windows7.png:$$/hover_windows7.png" } 
+  -windows { image = "$$/normal_windows.png:$$/hover_windows.png" }
+  -elementary { image = "$$/normal_elementary.png:$$/hover_elementary.png" }
+  -elementaryos { image = "$$/normal_elementary.png:$$/hover_elementary.png" }
+  -recovery { image = "$$/normal_recovery.png:$$/hover_recovery.png" }
+  -shutdown { image = "$$/normal_shutdown.png:$$/hover_shutdown.png" }
+  -restart { image = "$$/normal_restart.png:$$/hover_restart.png" }
+  -linux { image = "$$/normal_linux.png:$$/hover_linux.png" }
+  -ubuntu { image = "$$/normal_ubuntu.png:$$/hover_ubuntu.png" }
+  -debian { image = "$$/normal_debian.png:$$/hover_debian.png" }
+  -suse { image = "$$/normal_opensuse.png:$$/hover_opensuse.png" }
+  -freebsd { image = "$$/normal_freebsd.png:$$/hover_freebsd.png" }
+  -macosx { image = "$$/normal_osx.png:$$/hover_osx.png" }
+  -haiku { image = "$$/normal_haiku.png:$$/hover_haiku.png" }
+  -image { image = "$$/normal_os.png:$$/hover_os.png" }
+  -os { image = "$$/normal_os.png:$$/hover_os.png" }
+}