picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

shared/mount-util: make sure utab is ignored in umount_recursive()

Browse source 
See https://github.com/systemd/systemd/pull/12218#pullrequestreview-226029985.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-04-23 23:52:15 +02:00
parent e2857b3d87
commit 2f2d81d957
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/shared/libmount-util.h
View file

@ -29,10 +29,15 @@ static inline int libmount_parse(
if (!table || !iter)
return -ENOMEM;
/* If source or path are specified, we use on the functions which ignore utab.
* Only if both are empty, we use mnt_table_parse_mtab(). */
if (source)
r = mnt_table_parse_stream(table, source, path);
else if (path)
r = mnt_table_parse_file(table, path);
else
r = mnt_table_parse_mtab(table, path);
r = mnt_table_parse_mtab(table, NULL);
if (r < 0)
return r;

2
src/shared/mount-util.c
View file

@ -38,7 +38,7 @@ int umount_recursive(const char *prefix, int flags) {
again = false;
r = libmount_parse(NULL, NULL, &table, &iter);
r = libmount_parse("/proc/self/mountinfo", NULL, &table, &iter);
if (r < 0)
return log_debug_errno(r, "Failed to parse /proc/self/mountinfo: %m");