version bump

should now detect that 6.12.16 is newer than 6.6.74 for example

config.cfg

@@ -31,6 +31,9 @@ do_system_upgrade=yes
 # On Gentoo kernel upgrades, remove all but the last keep_kernels kernels from /boot
 keep_kernels=4
 
+# On FreeBSD system upgrades, remove all but the last keep_snapshots zfs root snapshots
+keep_snapshots=4
+
 # upgrade packages
 do_package_upgrade=yes
 

sau/freebsd.py

@@ -10,11 +10,14 @@ import sau.helpers
 PKG_PATH='/usr/sbin/pkg'
 SERVICE_PATH='/usr/sbin/service'
 FREEBSD_UPDATE_PATH='/usr/sbin/freebsd-update'
+ZFS='/sbin/zfs'
 
 # regex to identify rc.d-files
 rc_script_re = re.compile(r'^(?:/usr/local)?/etc/rc\.d/(.*)$')
 # regex to parse packages
 pkg_upgrade_re = re.compile(r'^\s([^\s]*): ([^\s]*) -> ([^\s]*).*$') 
+# regex for system zfs snapshots
+system_snaps_re=re.compile(r'^zroot/ROOT/default@\d{4}-\d\d-\d\d-\d\d:\d\d:\d\d-\d+(?:\s|$)')
 
 
 def identify_service_from_bin(exe):
@@ -55,7 +58,24 @@ def restart_service(service):
     else:
         log.info("restarted service {}".format(service))
 
+def clean_zfs(to_keep=5):
+    log = logging.getLogger(sau.LOGNAME)
+    cmd = [ ZFS, 'list', '-t', 'snapshot', '-H' ]
+    ret, out, err = sau.helpers.exec_cmd(cmd, timeout=300)
+
+    snapshots = sorted([l.split()[0] for l in out.splitlines() if re.match(system_snaps_re, l)], reverse=True)
+
+    if to_keep < 1:
+        log.warning(f'set to save {to_keep} snapshots; NO WAY!, will keep one anyway')
+        to_keep = 1
+
+    for s in snapshots[to_keep:]:
+        log.info(f'Removing old system snapshot "{s}"')
+        cmd = [ ZFS, 'destroy', '-R', s ]
+        ret, out, err = sau.helpers.exec_cmd(cmd, timeout=600)
+
 def system_upgrade():
+    conf = sau.config
     log = logging.getLogger(sau.LOGNAME)
     # this is how freebsd wants it...
     time.sleep(random.randint(0, 3600))
@@ -70,6 +90,8 @@ def system_upgrade():
             log.info('System updates installed:')
             for line in out.splitlines():
                 log.info(line)
+            keep_snapshots = conf.getint('default', 'keep_snapshots', fallback=4)
+            clean_zfs(keep_snapshots)
             return True
     else:
         log.warning('System upgrade failed (return code {}):'.format(ret))

sau/gentoo.py

@@ -119,6 +119,9 @@ def is_system_package(atom, eclasses):
         log.debug(f"{name} is a sys-boot package")
         return True
 
+    if eclasses is True:
+        return True
+
     # libc-packages should be considered system-packages as they generally
     # requires the system to be restarted. Not sure if there is a better way
     # then just checking for specific packages here, but as far as I know there
@@ -140,7 +143,7 @@ def is_system_package(atom, eclasses):
 def get_eclasses(atom):
     log = logging.getLogger(sau.LOGNAME)
     eclasses = []
-    name=re.sub(r'^[<=>]*(.*?)(?:-\d)?(?:::\w+)?$', r'\1', atom)
+    name=re.sub(r'^[<=>]*(.*?)(?:-\d+)?(?:::\w+)?$', r'\1', atom)
     test_re = re.compile(r'^\s*inherit\s+')
     cmd=[ EQUERY_PATH, 'w', name ]
     ret, out, err = sau.helpers.exec_cmd(cmd)
@@ -267,58 +270,14 @@ def pkg_upgrade():
         # from here on we shouldn't need to rebuild the upgraded packages again
         exclude_list = ' --exclude '.join(rebuild_packages.keys()).split()
 
-        # Rebuild go
-        go_packages = []
-        cmd = None
-        for package,eclasses in rebuild_packages.items():
-            if 'go-module' in eclasses or package == 'dev-lang/go':
-                go_packages.append(package)
-        if 'dev-lang/go' in go_packages:
-            log.info("Running golang-rebuild due to update of dev-lang/go")
-            cmd = [
-                    EMERGE_PATH,
-                    '--color', 'n',
-                    '-q',
-                    '--usepkg-exclude', '*/*',
-                    '@golang-rebuild',
-                    '--exclude' ] + exclude_list
-        elif go_packages:
-            dependencies = []
-            for package in go_packages:
-                dependencies.append(get_dependencies(package))
-            dependencies = set(dependencies)
-            upgraded = set(rebuild_packages.keys())
-            not_upgraded = dependencies-upgraded
-            if not_upgraded:
-                log.info(f'Rebuilding packages dependant of go modules {", ".join(go_packages)}')
-                cmd = [
-                    EMERGE_PATH,
-                    '--color', 'n',
-                    '-q',
-                    '--usepkg-exclude', '*/*'] + not_upgraded
-        if cmd:
-            ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
-            if ret != 0 or err:
-                log.error('Rebuild of go packages returned {}'.format(ret))
-                for line in out.splitlines():
-                    log.error('stdout: {}'.format(line))
-                for line in err.splitlines():
-                    log.error('stderr: {}'.format(line))
-                raise sau.errors.UpgradeError(f'Error during go rebuild')
-            else:
-                log.info('go rebuild complete')
-                for line in out.splitlines():
-                    if line.startswith(' * '):
-                        log.warning(line)
-
         # rebuild rust
-        if 'dev-lang/rust' in rebuild_packages:
+        if any([x in rebuild_packages for x in ('dev-lang/rust', 'dev-lang/rust-bin')]):
-            log.info("Running rust-rebuild due to update of dev-lang/rust")
+            log.info("Running rust-rebuild due to update of rust")
             cmd = [
                     EMERGE_PATH,
                     '--color', 'n',
                     '-q',
-                    '--usepkg-exclude', '*/*',
+                    '--usepkg', 'n',
                     '@rust-rebuild',
                     '--exclude' ] + exclude_list
             ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
@@ -338,7 +297,7 @@ def pkg_upgrade():
         # run perl-cleaner
         if 'dev-lang/perl' in rebuild_packages:
             log.info("Running perl-cleaner due to perl upgrade")
-            cmd = [ PCLEAN_PATH, '--all', '--', '-q', '--usepkg-exclude', '*/*']
+            cmd = [ PCLEAN_PATH, '--all', '--', '-q', '--usepkg', 'n']
             ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
             if ret != 0 or err:
                 log.error('perl-cleaner failed with code {}'.format(ret))
@@ -354,7 +313,7 @@ def pkg_upgrade():
                         log.warning(line)
 
         # rebuild live packages
-        cmd = [ EMERGE_PATH, '--color', 'n', '-q', '--usepkg-exclude', '*/*', '@live-rebuild' ]
+        cmd = [ EMERGE_PATH, '--color', 'n', '-q', '--usepkg', 'n', '@live-rebuild' ]
         ret, out, err = sau.helpers.exec_cmd(cmd, timeout=3600)
         if ret != 0 or err:
             log.error('live-rebuild returned {}'.format(ret))
@@ -389,7 +348,7 @@ def pkg_upgrade():
 
 
     ## Preserved rebuild
-    cmd = [ EMERGE_PATH, '--color', 'n', '--usepkg-exclude', '*/*', '-q', '@preserved-rebuild' ]
+    cmd = [ EMERGE_PATH, '--color', 'n', '--usepkg', 'n', '-q', '@preserved-rebuild' ]
     ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
 
     if ret != 0 or err:
@@ -416,11 +375,21 @@ def pkg_upgrade():
             for sysfile in ['config', 'initramfs', 'System.map', 'vmlinuz', 'kernel']:
                 match = sorted(
                         [f for f in files if f.startswith(f'{sysfile}-')],
-                        reverse=True)
+                        reverse=True,
+                        key=lambda x: tuple(map(int, x.split('-')[1].split('.')[:3])))
                 for f in match[keep_kernels:]:
                     log.debug(f"Removing old kernel file {f}")
                     os.remove(os.path.join(root, f))
             break
+        for root, dirs, files in os.walk('/usr/lib/modules'):
+            match = sorted([d for d in dirs if re.match(r'^\d+\.\d+\.\d+-.*', d)],
+                           reverse=True,
+                           key=lambda x: tuple(map(int, x.split('-')[0].split('.')[:3])))
+            for d in match[keep_kernels:]:
+                path = os.path.join(root, d)
+                log.debug(f"Removing old modules directory {path}")
+                shutil.rmtree(path)
+            break
 
         cmd = [ GRUB_MKCONFIG, '-o', '/boot/grub/grub.cfg' ]
         ret, out, err = sau.helpers.exec_cmd(cmd)

sau/services.py

@@ -177,7 +177,7 @@ def restart_services():
         if get_deleted_open_files(proc):
             service = services[proc_name]
             policy = _get_service_restart_policy(service)
-            _warn(policy, f'{proc} still has deleted files open')
+            log.warning(f'{proc} (service {service} with policy {policy}) still has deleted files open')
             recommend_restart = True
     return recommend_restart
 

setup.py

@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
 
 setup(
         name='sau',
-        version='1.4.2',
+        version='1.5.0',
         description='Tool for auto-updating OS and packages',
         author='Feffe',
         author_email='feffe@fulh.ax',