Removed using lazy mode for umount

Safer for cloud-init to not use lazy mode for unmount

1 files changed, 3 insertions, 12 deletions

diff --git a/cloudinit/util.py b/cloudinit/util.py
index 82d75843..6405db23 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -1294,16 +1294,12 @@ def ensure_dir(path, mode=None):
 
 
 @contextlib.contextmanager
-def unmounter(umount, lazy_support=True):
+def unmounter(umount):
     try:
         yield umount
     finally:
         if umount:
-            # Do not use Lazy Mode on some systems (freebsd)
-            if lazy_support:
-                umount_cmd = ["umount", '-l', umount]
-            else:
-                umount_cmd = ["umount", umount]
+            umount_cmd = ["umount", umount]
             subp(umount_cmd)
 
 
@@ -1386,12 +1382,7 @@ def mount_cb(device, callback, data=None, rw=False, mtype=None, sync=True):
         # Be nice and ensure it ends with a slash
         if not mountpoint.endswith("/"):
             mountpoint += "/"
-        # Set lazy_support to false if FreeBSD
-        if device.startswith("/dev/cd"):
-            lazy_support = False
-        else:
-            lazy_support = True
-        with unmounter(umount, lazy_support):
+        with unmounter(umount):
             if data is None:
                 ret = callback(mountpoint)
             else: