Merge pull request #1161 from dbungert/udi-fixes

Fix two bug reports from ubuntu-desktop-installer

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)

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)