From 94eab6fc844de84ff4319630ca32719ae04b389f Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Thu, 13 Jan 2022 10:59:22 -0700 Subject: [PATCH 1/2] mirror: add missing await --- subiquity/server/controllers/mirror.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subiquity/server/controllers/mirror.py b/subiquity/server/controllers/mirror.py index bbe4a38b..1880e107 100644 --- a/subiquity/server/controllers/mirror.py +++ b/subiquity/server/controllers/mirror.py @@ -134,7 +134,7 @@ class MirrorController(SubiquityController): async def _apply_apt_config(self): if self.apt_configurer is not None: - self.apt_configurer.cleanup() + await self.apt_configurer.cleanup() self.apt_configurer = get_apt_configurer( self.app, self.app.controllers.Source.source_path) await self.apt_configurer.apply_apt_config(self.context) From 7f3f928cfd1e08a3ae611c0e71137d8f90157996 Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Thu, 13 Jan 2022 11:02:07 -0700 Subject: [PATCH 2/2] apt: fix lowerdir handling lowerdir is a str, not a list --- subiquity/server/apt.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/subiquity/server/apt.py b/subiquity/server/apt.py index eb0df309..b3843b4a 100644 --- a/subiquity/server/apt.py +++ b/subiquity/server/apt.py @@ -15,6 +15,7 @@ import datetime import functools +import logging import os import shutil import tempfile @@ -29,6 +30,8 @@ from subiquitycore.utils import arun_command from subiquity.server.curtin import run_curtin_command +log = logging.getLogger('subiquity.server.apt') + class _MountBase: @@ -75,7 +78,7 @@ def _lowerdir_for_mnt(mnt): def _lowerdir_for_ovmnt(ovmnt): # One cannot indefinitely stack overlayfses so construct an # explicit list of the layers of the overlayfs. - return lowerdir_for(ovmnt.lowers + [ovmnt.upperdir]) + return lowerdir_for([ovmnt.lowers, ovmnt.upperdir]) @lowerdir_for.register(list)