From: Karel Zak <kzak@redhat.com>
Date: Wed, 22 Dec 2010 12:12:57 +0000 (+0100)
Subject: umount: add HAVE_LIBMOUNT_MOUNT code
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29be59e9f136f0839032b0a784333ed32ee1009d;p=util-linux

umount: add HAVE_LIBMOUNT_MOUNT code

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/mount/umount.c b/mount/umount.c
index e7626538..7e4eff77 100644
--- a/mount/umount.c
+++ b/mount/umount.c
@@ -335,7 +335,19 @@ umount_one (const char *spec, const char *node, const char *type,
  writemtab:
 	if (!nomtab &&
 	    (umnt_err == 0 || umnt_err == EINVAL || umnt_err == ENOENT)) {
+#ifdef HAVE_LIBMOUNT_MOUNT
+		mnt_update *upd = mnt_new_update();
+
+		if (upd && !mnt_update_set_fs(upd, 0, node, NULL)) {
+			mnt_lock *lc = init_libmount_lock(
+						mnt_update_get_filename(upd));
+			mnt_update_tab(upd, lc);
+			init_libmount_lock(NULL);
+		}
+		mnt_free_update(upd);
+#else
 		update_mtab (node, NULL);
+#endif
 	}
 
 	if (res >= 0)