From aae85806c102d318092a0f691978cd7b62b46eee Mon Sep 17 00:00:00 2001 From: Fredrik Eriksson Date: Sun, 12 Mar 2023 14:06:10 +0100 Subject: [PATCH] add support for grub --- bin/sau | 2 +- sau/gentoo.py | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/bin/sau b/bin/sau index bb26f3a..d12ae1c 100755 --- a/bin/sau +++ b/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() diff --git a/sau/gentoo.py b/sau/gentoo.py index db0b884..55fdae6 100644 --- a/sau/gentoo.py +++ b/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('^\[([^\]])\] ([^ ]*) \((.*)\): .*$') @@ -67,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(): @@ -92,6 +93,7 @@ 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() @@ -114,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 @@ -136,6 +139,12 @@ def pkg_upgrade(): else: 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') @@ -185,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