From 43437d549146c18c44f93b67fbd374ce995eb967 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Fri, 10 Jan 2025 14:23:54 +0100 Subject: [PATCH] refs #1327 add ogCleanOs() --- client/lib/engine/bin/PostConfLib.py | 15 +++++++++++++++ client/lib/engine/bin/ProtocolLib.py | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/client/lib/engine/bin/PostConfLib.py b/client/lib/engine/bin/PostConfLib.py index 2a1e0c4..e97b266 100644 --- a/client/lib/engine/bin/PostConfLib.py +++ b/client/lib/engine/bin/PostConfLib.py @@ -7,6 +7,7 @@ #*/ import os +import glob import subprocess import ogGlobals @@ -15,6 +16,8 @@ import FileSystemLib import FileLib import NetLib import RegistryLib +import InventoryLib +import BootLib #/** # ogCleanOs int_ndisk int_nfilesys @@ -27,6 +30,18 @@ import RegistryLib #@note Antes incluido en la funcion ogReduceFs #@return (nada) #*/ ## +#ogCleanOs (1, 1) +def ogCleanOs (disk, par): + t = InventoryLib.ogGetOsType (disk, par) + if 'Linux' == t: + BootLib.ogCleanLinuxDevices (disk, par) + mntdir = FileSystemLib.ogMount (disk, par) + for t in glob.glob ('{mntdir}/tmp/*'): + shutil.rmtree (t) + elif 'Windows' == t: + for f in 'pagefile.sys', 'hiberfil.sys', 'swapfile.sys': + p = FileLib.ogGetPath (src=f'{disk} {par}', file=f) + if p: FileLib.ogDeleteFile (disk=disk, par=par, file=f) diff --git a/client/lib/engine/bin/ProtocolLib.py b/client/lib/engine/bin/ProtocolLib.py index 9912e4c..d06a696 100644 --- a/client/lib/engine/bin/ProtocolLib.py +++ b/client/lib/engine/bin/ProtocolLib.py @@ -880,9 +880,9 @@ def ogUpdateCacheIsNecesary (repo, file, proto): print (f'filetarget ({filetarget})') if not filetarget: # borramos el fichero bf del torrent, en el caso de que se hubiese quedado de algun proceso fallido - if FileLib.ogGetPath (src='CACHE', file=f'/{file}.torrent.bf'): ogDeleteFile ('CACHE', f'{file}.torrent.bf') - if FileLib.ogGetPath (src='CACHE', file=f'/{file}.sum'): ogDeleteFile ('CACHE', f'{file}.sum') - if FileLib.ogGetPath (src='CACHE', file=f'/{file}.full.sum'): ogDeleteFile ('CACHE', f'{file}.full.sum') + if FileLib.ogGetPath (src='CACHE', file=f'/{file}.torrent.bf'): ogDeleteFile (container='CACHE', file=f'{file}.torrent.bf') + if FileLib.ogGetPath (src='CACHE', file=f'/{file}.sum'): ogDeleteFile (container='CACHE', file=f'{file}.sum') + if FileLib.ogGetPath (src='CACHE', file=f'/{file}.full.sum'): ogDeleteFile (container='CACHE', file=f'{file}.full.sum') print ('TRUE(0), es necesario actualizar. Paso 1, la cache no contiene esa imagen ') return True