]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
mkosi: shorten umount commands a bit 46/head
authorLennart Poettering <lennart@poettering.net>
Fri, 9 Dec 2016 16:27:31 +0000 (17:27 +0100)
committerLucas Werkmeister <mail@lucaswerkmeister.de>
Tue, 13 Dec 2016 16:34:10 +0000 (17:34 +0100)
mkosi

diff --git a/mkosi b/mkosi
index cbdf6daf060c24ddd085ab3aed1c61df6611df16..4854e7ce5f396e75c5ffa11d54e27813b0561e17 100755 (executable)
--- 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):