summaryrefslogtreecommitdiffstats
path: root/libmount/src/context_umount.c
diff options
context:
space:
mode:
authorKarel Zak2013-05-14 10:32:56 +0200
committerKarel Zak2013-05-14 10:32:56 +0200
commit0b56c459568405213085d8f7ec1f76b7a85d7907 (patch)
tree8f4e9231f61aec214ad4eb6cf9d1d40820a35eee /libmount/src/context_umount.c
parentlib/tty: don't hardcode terminal fd in get_terminal_name() (diff)
downloadkernel-qcow2-util-linux-0b56c459568405213085d8f7ec1f76b7a85d7907.tar.gz
kernel-qcow2-util-linux-0b56c459568405213085d8f7ec1f76b7a85d7907.tar.xz
kernel-qcow2-util-linux-0b56c459568405213085d8f7ec1f76b7a85d7907.zip
libmount: don't ignore root fs on umount -a
The release v2.22 (the new umount) introduces a regression when root fs is excluded from umount --all. There is not reason for this exception. The libmount should be smart enough to disable mtab update after rootfs umount. Reported-by: Bruce Dubbs <bruce.dubbs@gmail.com> Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libmount/src/context_umount.c')
-rw-r--r--libmount/src/context_umount.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c
index b9484594b..4a8659c9c 100644
--- a/libmount/src/context_umount.c
+++ b/libmount/src/context_umount.c
@@ -909,11 +909,8 @@ int mnt_context_next_umount(struct libmnt_context *cxt,
DBG(CXT, mnt_debug_h(cxt, "next-umount: trying %s", tgt));
- /* ignore root filesystem */
- if ((tgt && (strcmp(tgt, "/") == 0 || strcmp(tgt, "root") == 0)) ||
-
/* ignore filesystems not match with options patterns */
- (cxt->fstype_pattern && !mnt_fs_match_fstype(*fs,
+ if ((cxt->fstype_pattern && !mnt_fs_match_fstype(*fs,
cxt->fstype_pattern)) ||
/* ignore filesystems not match with type patterns */