Merge pull request 'refs #1925 send /stopped on poweroff or restart' (#33) from agent-stopped-on-poweroff into main

Reviewed-on: #33

CHANGELOG.md

@@ -1,12 +1,158 @@
-# Changelog 
+# Changelog
 
-## [0.1.1] - 2025-02-28
+All notable changes to this project will be documented in this file.
 
-### Changed - 2025-03-19
+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.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
 
 ## [0.1.0] - 2025-02-28
 
-### Addded
+### Added
 
 - 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}/oggui"
+                    env.BUILD_DIR = "${WORKSPACE}/ogclient"
                     sh "mkdir -p ${env.BUILD_DIR}"
                 }
             }
@@ -48,16 +48,22 @@ 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 {
-                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
-                    '''
+                script {
+                    construirPaquete(env.BUILD_DIR, "../artifacts", "172.17.8.68", "/var/tmp/opengnsys/debian-repo/ogclient")
                 }
             }
         }
@@ -69,7 +75,24 @@ pipeline {
             }
             agent { label 'debian-repo' }
             steps {
-                sh "aptly repo add opengnsys-devel /var/tmp/opengnsys/debian-repo/ogclient/*.deb"
+                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)
+                }
             }
         }
     }

debian/ogclient.postinst

@@ -23,13 +23,7 @@ case "$1" in
             cp -a "$OLD_FILE" "$NEW_FILE"
 
             # Append our configuration
-            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"
+            echo "include = /etc/samba/smb-ogclient.conf" >> "$OLD_FILE"
 
             # Reload Samba
             if command -v systemctl >/dev/null 2>&1; then
@@ -48,6 +42,8 @@ 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

@@ -0,0 +1,15 @@
+#!/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 = no
+   writeable = yes 
    locking = no
    path = /opt/opengnsys/ogclient
    guest ok = no

ogclient/functions/ogCopyFile

@@ -55,6 +55,9 @@ 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,6 +2,9 @@
 
 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,6 +9,7 @@ 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
@@ -61,23 +62,24 @@ 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 = ptt = tch = None
+dis = tch = None
 for item in tbprm:
     if '=' not in item: continue
 
     k, v = item.split ('=', 1)
-    if k not in ['dis', 'tch', 'ptt']:                      ## 'ptt' added, unused 'che' removed
+    if k not in ['dis', 'tch']:
         print (f'ignoring unknown disk parameter ({k})')
         continue
 
     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: sys.exit (ogGlobals.OG_ERR_FORMAT)
-if ptt is None: ptt = 'MSDOS'
-if tch is None: tch = '0'
+if dis is None:
+    coproc.kill()
+    sys.exit (ogGlobals.OG_ERR_FORMAT)
+if tch is None:
+    tch = '0'
 
 # Toma valores de distribución de particiones, separados por "%".
 tbp = []  # Valores de configuración (parámetros para ogCreatePartitions)
@@ -112,6 +114,7 @@ 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.
@@ -138,18 +141,21 @@ 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}')
-    SystemLib.ogExecAndLog ('command', CacheLib.initCache, tch)
+    rc = SystemLib.ogExecAndLog ('command', CacheLib.initCache, tch)
+    if rc:
+        SystemLib.ogRaiseError (['log', 'session'], ogGlobals.OG_ERR_CACHE, f'initCache failed')
+        coproc.kill()
+        sys.exit (1)
 
 # 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 StringLib.ogCheckIpAddress (repo):
+if 'REPO' == repo or ogCheckIpAddress (repo):
         # Si falla el cambio -> salimos con error repositorio no valido
     if not ogChangeRepo (repo):
         ogRaiseError ([], ogGlobals.OG_ERR_NOTFOUND, repo)

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 (script_path, capture_output=True, text=True).returncode
+RETVAL = subprocess.run (['bash', script_path]).returncode
 
 
 TIME = time.time() - TIME1

ogclient/interfaceAdm/Reiniciar.py

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

ogclient/interfaceAdm/getConfiguration.py

@@ -1,80 +1,78 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
+
 import os
+import glob
 import subprocess
 
-def run_command(command):
-    result = subprocess.run(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    return result.stdout.decode().strip()
+from InventoryLib import ogGetSerialNumber, ogGetOsVersion, ogIsEfiActive
+from DiskLib import ogDiskToDev, ogGetPartitionsNumber, ogGetPartitionTableType, ogGetDiskSize, ogGetPartitionId, ogGetPartitionSize
+from FileSystemLib import ogMount, ogGetMountPoint, ogGetFsType
 
-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}")
+ser = ogGetSerialNumber()
+fwt = 'UEFI' if ogIsEfiActive() else 'BIOS'
+print (f'ser={ser}\nfwt={fwt}')
 
+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)
 
-        cfg += f"{dsk}:0:{ptt}:::{run_command(f'ogGetDiskSize {dsk}')}: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')
 
-        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
+        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)
 
-            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]
+            # 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 not soi:
-                        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)
+                        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'
                 else:
-                    soi = ""
-                    uso = 0
+                    soi = ''
+                    uso = '0'
 
-            cfg += f"{dsk}:{par}:{cod}:{fsi}:{soi}:{tam}:{uso};"
+            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')
 
-    if not cfg:
-        cfg = "1:0:0:::0;"
+# 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'])
 
-    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()
+# Borramos marcas de arranque de Windows
+for f in glob.glob ('/mnt/*/ogboot.*') + glob.glob ('/mnt/*/*/ogboot.*'):
+    try: os.unlink (f)
+    except: pass

ogclient/interfaceAdm/getIpAddress.py

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

ogclient/lib/burg/themes/OpenGnsys/extended

@@ -1,79 +0,0 @@
-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

@@ -1,21 +0,0 @@
-+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" }
-}