diff options
| author | Karel Zak | 2010-11-23 20:39:55 +0100 |
|---|---|---|
| committer | Karel Zak | 2011-01-03 12:28:46 +0100 |
| commit | b0bb8fb6f9c3d54d230b785695a5bceab7e3f320 (patch) | |
| tree | 967b3095dab666a892f40271598dd359dfd5fc12 /shlibs/mount/src/tab_parse.c | |
| parent | tests: improve libmount context mount and umount test (diff) | |
| download | kernel-qcow2-util-linux-b0bb8fb6f9c3d54d230b785695a5bceab7e3f320.tar.gz kernel-qcow2-util-linux-b0bb8fb6f9c3d54d230b785695a5bceab7e3f320.tar.xz kernel-qcow2-util-linux-b0bb8fb6f9c3d54d230b785695a5bceab7e3f320.zip | |
libmount: fix utab file and dir modes, add new debug messages
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'shlibs/mount/src/tab_parse.c')
| -rw-r--r-- | shlibs/mount/src/tab_parse.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c index af5008328..21f64336c 100644 --- a/shlibs/mount/src/tab_parse.c +++ b/shlibs/mount/src/tab_parse.c @@ -631,6 +631,9 @@ int mnt_tab_parse_mtab(mnt_tab *tb, const char *filename) const char *utab = NULL; if (mnt_has_regular_mtab(&filename, NULL)) { + + DBG(TAB, mnt_debug_h(tb, "force %s usage", filename)); + rc = mnt_tab_parse_file(tb, filename); if (!rc) return 0; @@ -647,11 +650,11 @@ int mnt_tab_parse_mtab(mnt_tab *tb, const char *filename) return mnt_tab_parse_file(tb, _PATH_PROC_MOUNTS); /* - * try to read userspace specific information from /dev/.mount/utabs/ + * try to read userspace specific information from /dev/.mount/utabs */ utab = mnt_get_utab_path(); if (utab) { - mnt_tab *u_tb = mnt_new_tab_from_dir(utab); + mnt_tab *u_tb = mnt_new_tab_from_file(utab); if (u_tb) { mnt_fs *u_fs; |