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

util: make path_is_mount_point() recognize bind mounts, too

This commit is contained in:
Lennart Poettering 2012-08-25 00:10:17 +02:00
parent ddffe89246
commit cde9cb343a
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TODO
View File

@ -49,12 +49,12 @@ Bugfixes:
Features:
* introduce $container_boot_id
* introduce /run/kmsg in containers?
* introduce $container_boot_id?
* wall messages for shutdown should move to logind
* remove wants from journald.service
* allow writing multiple conditions in unit files on one line
* journal: json output needs to be able to deal with multiple assignments of the same field

23
src/shared/path-util.c
View File

@ -330,15 +330,22 @@ bool path_equal(const char *a, const char *b) {
}
int path_is_mount_point(const char *t, bool allow_symlink) {
struct stat a, b;
char *parent;
int r;
struct file_handle *h;
int mount_id, mount_id_parent;
if (allow_symlink)
r = stat(t, &a);
else
r = lstat(t, &a);
/* We are not actually interested in the file handles, but
* name_to_handle_at() also passes us the mount ID, hence use
* it but throw the handle away */
if (path_equal(t, "/"))
return 1;
h = alloca(MAX_HANDLE_SZ);
h->handle_bytes = MAX_HANDLE_SZ;
r = name_to_handle_at(AT_FDCWD, t, h, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
if (r < 0) {
if (errno == ENOENT)
return 0;
@ -350,13 +357,15 @@ int path_is_mount_point(const char *t, bool allow_symlink) {
if (r < 0)
return r;
r = lstat(parent, &b);
h->handle_bytes = MAX_HANDLE_SZ;
r = name_to_handle_at(AT_FDCWD, parent, h, &mount_id_parent, 0);
free(parent);
if (r < 0)
return -errno;
return a.st_dev != b.st_dev;
return mount_id != mount_id_parent;
}
int path_is_read_only_fs(const char *path) {