diff options
| author | Karel Zak | 2016-04-14 14:26:54 +0200 |
|---|---|---|
| committer | Karel Zak | 2016-04-14 14:26:54 +0200 |
| commit | e778642a9eb96975fcf3baa61dfa10add628af1a (patch) | |
| tree | bcd1f5f3030d19b56755abcbf71a3420e36bedcc /libmount/src/tab_update.c | |
| parent | build-sys: add --enable-libuuid-force-uuidd (diff) | |
| download | kernel-qcow2-util-linux-e778642a9eb96975fcf3baa61dfa10add628af1a.tar.gz kernel-qcow2-util-linux-e778642a9eb96975fcf3baa61dfa10add628af1a.tar.xz kernel-qcow2-util-linux-e778642a9eb96975fcf3baa61dfa10add628af1a.zip | |
libmount: don't support /etc/mtab by default
The file mtab is evil and already unused by mainstream distributions.
Now libmount is able to detect mtab->/proc/mounts and use
/proc/self/mountinfo if necessary. This heuristic seems overkill in
many cases. It's also dangerous on systems where mountinfo is strongly
required (systemd based distros).
This patch #ifdefs mtab code and forces libmount to always use
/proc/self/mountinfo.
The new configure option --enable-libmount-support-mtab is necessary
to enable old behavior to support mtab.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libmount/src/tab_update.c')
| -rw-r--r-- | libmount/src/tab_update.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmount/src/tab_update.c b/libmount/src/tab_update.c index 631e1cd9f..d85cb89da 100644 --- a/libmount/src/tab_update.c +++ b/libmount/src/tab_update.c @@ -105,7 +105,9 @@ int mnt_update_set_filename(struct libmnt_update *upd, const char *filename, /* detect tab filename -- /etc/mtab or /run/mount/utab */ +#ifdef USE_LIBMOUNT_SUPPORT_MTAB mnt_has_regular_mtab(&path, &rw); +#endif if (!rw) { path = NULL; mnt_has_regular_utab(&path, &rw); |