From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 9 Dec 2016 16:27:31 +0000 (+0100)
Subject: mkosi: shorten umount commands a bit
X-Git-Tag: v2~31^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F46%2Fhead;p=thirdparty%2Fmkosi.git

mkosi: shorten umount commands a bit
---

diff --git a/mkosi b/mkosi
index cbdf6daf0..4854e7ce5 100755
--- a/mkosi
+++ b/mkosi
@@ -354,14 +354,11 @@ def mount_image(args, workspace, loopdev):
         yield
     finally:
         with complete_step('Unmounting image'):
-            umount(os.path.join(root, "home"))
-            umount(os.path.join(root, "srv"))
-            umount(os.path.join(root, "efi"))
-            umount(os.path.join(root, "var/cache/dnf"))
-            umount(os.path.join(root, "var/cache/apt/archives"))
-            umount(os.path.join(root, "run"))
-            umount(os.path.join(root, "tmp"))
-            umount(os.path.join(root))
+
+            for d in ("home", "srv", "efi", "var/cache/dnf", "var/cache/apt/archives", "run", "tmp"):
+                umount(os.path.join(root, d))
+
+            umount(root)
 
 @contextlib.contextmanager
 def mount_api_vfs(args, workspace):