diff options
author | root <root@rshg054.dnsready.net> | 2012-01-27 23:15:06 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-01-27 23:15:06 +0000 |
commit | 2493f16093b14a81e949bd6a1b89724cb931807d (patch) | |
tree | b93ed56dddfb9e067d0e29e363bc8e98286b9ac8 /testing/systemd/0001-mount-fix-automount-regression.patch | |
parent | 3741146d50cb93e8985f8aac937e36d35ee76446 (diff) |
Fri Jan 27 23:15:06 UTC 2012
Diffstat (limited to 'testing/systemd/0001-mount-fix-automount-regression.patch')
-rw-r--r-- | testing/systemd/0001-mount-fix-automount-regression.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/testing/systemd/0001-mount-fix-automount-regression.patch b/testing/systemd/0001-mount-fix-automount-regression.patch new file mode 100644 index 000000000..a064f20cf --- /dev/null +++ b/testing/systemd/0001-mount-fix-automount-regression.patch @@ -0,0 +1,45 @@ +From da375869ff31f83938123dc0d2a8d5c0f0845a0c Mon Sep 17 00:00:00 2001 +From: Michal Schmidt <mschmidt@redhat.com> +Date: Thu, 26 Jan 2012 01:19:19 +0100 +Subject: [PATCH] mount: fix automount regression + +Tom Gundersen noticed a regression where comment=systemd.automount in +fstab no longer prevented the adding of the After=foo.mount dependency +into local-fs.target. He bisected it to commit 9ddc4a26. + +It turns out that clearing the default_dependencies flag is necessary +after all, in order to avoid complementing of Wants= with After= in the +target unit. We still want to add the dependencies on quota units and +umount.target though. +--- + src/mount.c | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) + +diff --git a/src/mount.c b/src/mount.c +index 6d0af4e..965f705 100644 +--- a/src/mount.c ++++ b/src/mount.c +@@ -583,6 +583,11 @@ static int mount_load(Unit *u) { + + if (UNIT(m)->fragment_path) + m->from_fragment = true; ++ else if (m->from_etc_fstab) ++ /* We always add several default dependencies to fstab mounts, ++ * but we do not want the implicit complementing of Wants= with After= ++ * in the target unit that this mount unit will be hooked into. */ ++ UNIT(m)->default_dependencies = false; + + if (!m->where) + if (!(m->where = unit_name_to_path(u->id))) +@@ -615,7 +620,7 @@ static int mount_load(Unit *u) { + if ((r = mount_add_fstab_links(m)) < 0) + return r; + +- if (UNIT(m)->default_dependencies) ++ if (UNIT(m)->default_dependencies || m->from_etc_fstab) + if ((r = mount_add_default_dependencies(m)) < 0) + return r; + +-- +1.7.8.4 + |