shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-25 18:50:18 +03:00
Code

Merge pull request #3069 from Werkov/fix-dependencies-for-bind-mounts

Browse Source 
Always create dependencies for bind mounts
This commit is contained in:
Lennart Poettering 2016-04-29 12:50:29 +02:00
commit 365007369b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/mount.c
View File

@ -86,6 +86,15 @@ static bool mount_is_network(const MountParameters *p) {
return mount_needs_network(p->options, p->fstype);
}
static bool mount_is_loop(const MountParameters *p) {
assert(p);
if (fstab_test_option(p->options, "loop\0"))
return true;
return false;
}
static bool mount_is_bind(const MountParameters *p) {
assert(p);
@ -269,12 +278,12 @@ static int mount_add_mount_links(Mount *m) {
}
/* Adds in links to other mount points that might be needed
* for the source path (if this is a bind mount) to be
* for the source path (if this is a bind mount or a loop mount) to be
* available. */
pm = get_mount_parameters_fragment(m);
if (pm && pm->what &&
path_is_absolute(pm->what) &&
!mount_is_network(pm)) {
(mount_is_bind(pm) || mount_is_loop(pm) || !mount_is_network(pm))) {
r = unit_require_mounts_for(UNIT(m), pm->what);
if (r < 0)