add support for grub

bin/sau

@@ -99,7 +99,7 @@ def main():
         reboot_required = platform.system_upgrade()
 
     if conf.getboolean('default', 'do_package_upgrade', fallback=True):
-        platform.pkg_upgrade()
+        reboot_required = reboot_required or platform.pkg_upgrade()
 
     if conf.getboolean('default', 'do_service_restart', fallback=True):
         reboot_recommended = sau.services.restart_services()

config.cfg

@@ -44,12 +44,12 @@ syslog_loglevel=info
 # platform
 [packages]
 # Gentoo uses the category/package naming scheme
-dev-db/postgresql=2
+dev-db/postgresql=1
 
 # Gentoo kernel stuff should be updated manually
-sys-kernel/gentoo-sources=-1
+sys-kernel/gentoo-sources=99
-sys-kernel/spl=-1
+sys-kernel/spl=99
-sys-fs/zfs-kmod=-1
+sys-fs/zfs-kmod=99
 
 # FreeBSD uses the short package name (without category)
 gitlab=2

sau/gentoo.py

@@ -9,6 +9,7 @@ EIX_SYNC_PATH='/usr/bin/eix-sync'
 RC_SERVICE_PATH='/sbin/rc-service'
 EMERGE_PATH='/usr/bin/emerge'
 EQUERY_PATH='/usr/bin/equery'
+GRUB_MKCONFIG='/usr/sbin/grub-mkconfig'
 
 # parsing output from eix -Ttnc
 package_re = re.compile('^\[([^\]])\] ([^ ]*) \((.*)\): .*$')
@@ -24,12 +25,7 @@ def identify_service_from_bin(exe):
     ret, out, err = sau.helpers.exec_cmd(cmd)
 
     if ret != 0:
-        log.warning("searching for owner of {} failed:".format(exe))
+        raise sau.errors.UnknownServiceError("searching for owner of {} failed:".format(exe))
-        for line in out.splitlines():
-            log.warning("stdout: {}".format(line))
-        for line in err.splitlines():
-            log.warning("stderr: {}".format(line))
-        return None
     
     pkg = out.strip()
     cmd = [ EQUERY_PATH, '-Cq', 'f', pkg ]
@@ -48,9 +44,9 @@ def identify_service_from_bin(exe):
         if match:
             matches.add(match.group(1))
     if len(matches) < 1:
-        log.warning('Could not find any init script in package {}'.format(pkg))
+        raise sau.errors.UnknownServiceError('Could not find any init script in package {}'.format(pkg))
     elif len(matches) > 1:
-        log.warning('Found multiple init script in package {}'.format(pkg))
+        raise sau.errors.UnknownServiceError('Found multiple init script in package {}'.format(pkg))
     else:
         return matches.pop()
     return None
@@ -72,7 +68,7 @@ def restart_service(service):
 
 def system_upgrade():
     log = logging.getLogger(sau.LOGNAME)
-    log.debug('Gentoo has no concept of system upgrade, ignoring...')
+    log.debug('Gentoo "system_upgrade" is done at package upgrade stage; ignoring here...')
     return False
 
 def _sync_portage():
@@ -97,20 +93,18 @@ def _sync_portage():
 def pkg_upgrade():
     log = logging.getLogger(sau.LOGNAME)
     conf = sau.config
+    do_system_upgrade = conf.getboolean('default', 'do_system_upgrade', fallback=False)
 
     if conf.getboolean('default', 'do_reposync', fallback=True):
         _sync_portage()
 
     # [ebuild     U ] media-plugins/alsa-plugins-1.1.8 [1.1.6]
-    pretend_re = re.compile(r'^\[ebuild ([^\]]*)\] ([^ ]+)( \[[^\]]+\])?')
+    pretend_re = re.compile(r'^\[(?:ebuild|binary) ([^\]]*)\] ([^ ]+?)-(\d[-\.\w]*)( \[[^\]]+\])?')
-    # media-plugins/alsa-plugins-1.1.8
-    version_re = re.compile(r'^(.*/.*)-(\d+.*)$')
-
     ignore_re = re.compile(r'^(|.*caus.* rebuilds.*|.*scheduled for merge.*|.*waiting for lock on.*)$')
     
     default_version_sens = conf.getint('default', 'version_sensitivity', fallback=1)
 
-    cmd = [ EMERGE_PATH, '--color', 'n', '-uDNpq', '@world' ]
+    cmd = [ EMERGE_PATH, '--color', 'n', '-uDNpq', '--with-bdeps=y', '@world' ]
     ret, out, err = sau.helpers.exec_cmd(cmd)
 
     if not ret == 0:
@@ -122,6 +116,7 @@ def pkg_upgrade():
         return False
 
     do_rebuild = True
+    do_grub = False
     for line in out.splitlines():
         if re.match(ignore_re, line):
             continue
@@ -131,27 +126,31 @@ def pkg_upgrade():
             continue
         status = match.group(1)
         name = match.group(2)
-        old = match.group(3)
+        new = match.group(3)
+        old = match.group(4)
         if not old:
             continue
         old = old.strip(' []')
-        nmatch = re.match(version_re, name)
-        name = nmatch.group(1)
-        version = nmatch.group(2)
 
         sens = conf.getint('packages', name, fallback=default_version_sens)
-        common = sau.helpers.version_diff(version, old)
+        common = sau.helpers.version_diff(new, old)
         if sens <= common:
-            log.info('{}-{} -> {} configured level {} <= pkg level {}'.format(name, old, version, sens, common))
+            log.info('{} -- {} -> {} configured level {} <= pkg level {}'.format(name, old, new, sens, common))
         else:
-            log.warning('{}-{} -> {} configured level {} > pkg level {}'.format(name, old, version, sens, common))
+            log.warning('{} -- {} -> {} configured level {} > pkg level {}'.format(name, old, new, sens, common))
+            do_rebuild = False
+        if name.startswith('sys-kernel/'):
+            if do_system_upgrade:
+                do_grub = True
+            else:
+                log.warning(f"Kernel package {name} has an update, but system upgrade is disabled")
                 do_rebuild = False
 
     if not do_rebuild:
         log.warning('Some packages require manual attention, did not upgrade')
         return False
 
-    cmd = [ EMERGE_PATH, '--color', 'n', '-uDNq', '@world' ]
+    cmd = [ EMERGE_PATH, '--color', 'n', '-uDNq', '--with-bdeps=y', '@world' ]
     ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
 
     if ret != 0 or err:
@@ -195,3 +194,26 @@ def pkg_upgrade():
             for line in out.splitlines():
                 if line.startswith(' * '):
                     log.warning(line)
+
+    if do_grub:
+        for root, dirs, files in os.walk('/boot'):
+            for sysfile in ['config', 'initramfs', 'System.map', 'vmlinuz']:
+                match = sorted(
+                        [f for f in files if f.startswith(f'{sysfile}-')],
+                        reverse=True)
+                for f in match[4:]:
+                    log.debug(f"Removing old kernel file {f}")
+                    os.remove(os.path.join(root, f))
+            break
+
+        cmd = [ GRUB_MKCONFIG, '-o', '/boot/grub/grub.cfg' ]
+        ret, out, err = sau.helpers.exec_cmd(cmd)
+        if ret != 0:
+            log.warning(f"grub-mkconfig returned {ret}:")
+            for line in out.splitlines():
+                log.warning('stdout: {}'.format(line))
+            for line in err.splitlines():
+                log.warning('stderr: {}'.format(line))
+        else:
+            log.info("grub reconfigured")
+            return True

setup.py

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