feffe/sau
1
0
Fork 0
Code Issues Pull Requests Projects Releases 20 Wiki Activity

add support for grub

Browse Source
This commit is contained in:
Fredrik Eriksson 2023-03-12 14:06:10 +01:00
parent 0ea7804427
commit 245a250508
Signed by: feffe
GPG Key ID: CD5A131FADFA3968
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/sau
View File

@ -99,7 +99,7 @@ def main():
reboot_required = platform.system_upgrade() reboot_required = platform.system_upgrade()
if conf.getboolean('default', 'do_package_upgrade', fallback=True): 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): if conf.getboolean('default', 'do_service_restart', fallback=True):
reboot_recommended = sau.services.restart_services() reboot_recommended = sau.services.restart_services()

34
sau/gentoo.py
View File

@ -9,6 +9,7 @@ EIX_SYNC_PATH='/usr/bin/eix-sync'
RC_SERVICE_PATH='/sbin/rc-service' RC_SERVICE_PATH='/sbin/rc-service'
EMERGE_PATH='/usr/bin/emerge' EMERGE_PATH='/usr/bin/emerge'
EQUERY_PATH='/usr/bin/equery' EQUERY_PATH='/usr/bin/equery'
GRUB_MKCONFIG='/usr/sbin/grub-mkconfig'
# parsing output from eix -Ttnc # parsing output from eix -Ttnc
package_re = re.compile('^\[([^\]])\] ([^ ]*) \((.*)\): .*$') package_re = re.compile('^\[([^\]])\] ([^ ]*) \((.*)\): .*$')
@ -67,7 +68,7 @@ def restart_service(service):
def system_upgrade(): def system_upgrade():
log = logging.getLogger(sau.LOGNAME) 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 return False
def _sync_portage(): def _sync_portage():
@ -92,6 +93,7 @@ def _sync_portage():
def pkg_upgrade(): def pkg_upgrade():
log = logging.getLogger(sau.LOGNAME) log = logging.getLogger(sau.LOGNAME)
conf = sau.config conf = sau.config
do_system_upgrade = conf.getboolean('default', 'do_system_upgrade', fallback=False)
if conf.getboolean('default', 'do_reposync', fallback=True): if conf.getboolean('default', 'do_reposync', fallback=True):
_sync_portage() _sync_portage()
@ -114,6 +116,7 @@ def pkg_upgrade():
return False return False
do_rebuild = True do_rebuild = True
do_grub = False
for line in out.splitlines(): for line in out.splitlines():
if re.match(ignore_re, line): if re.match(ignore_re, line):
continue continue
@ -136,6 +139,12 @@ def pkg_upgrade():
else: else:
log.warning('{} -- {} -> {} configured level {} > pkg level {}'.format(name, old, new, sens, common)) log.warning('{} -- {} -> {} configured level {} > pkg level {}'.format(name, old, new, sens, common))
do_rebuild = False 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: if not do_rebuild:
log.warning('Some packages require manual attention, did not upgrade') log.warning('Some packages require manual attention, did not upgrade')
@ -185,3 +194,26 @@ def pkg_upgrade():
for line in out.splitlines(): for line in out.splitlines():
if line.startswith(' * '): if line.startswith(' * '):
log.warning(line) 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 or err:
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