[systemd-devel] automount regression

[Tom Gundersen]

On Wed, Jan 25, 2012 at 12:39 PM, Tom Gundersen <teg at jklm.no> wrote:
> I noticed a regression in the automount handling that I could not
> immediately figure out. I know for a fact that this used to work "a
> long time ago", and that it does not work with v39, but I have not
> bisected further.

It seems this was caused by:


commit 9ddc4a26e56b06cd7774a03597980351855d8d54
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Fri Jan 13 23:55:28 2012 +0100

    mount: fix quota

    quotacheck.service and quotaon.service were not pulled in for fstab mounts.
    Fix it by not clearing the default_dependencies flag.

    The root filesystem may have quotas too, so don't check for "/" there.

    No need to have duplicate code for adding dependencies on umount.target.

    https://bugzilla.redhat.com/show_bug.cgi?id=773431




The following (partial) revert fixed my problem, but I'm not sure what
the proper fix would be.



commit 38ed3b9dcf083a614fc32e53a59d8b936aae6ee5
Author: Tom Gundersen <teg at jklm.no>
Date:   Wed Jan 25 15:33:18 2012 +0100

    mount: allow a mount unit to be WantedBy, but not Before local-fs.target

    This partially reverts 9ddc4a26e56b06cd7774a03597980351855d8d54, probably
    breaking lots of other things in the process.

diff --git a/src/mount.c b/src/mount.c
index 6d0af4e..5e2c8b6 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -584,6 +584,9 @@ static int mount_load(Unit *u) {
                 if (UNIT(m)->fragment_path)
                         m->from_fragment = true;

+                else if (m->from_etc_fstab)
+                        m->meta.default_dependencies = false;
+
                 if (!m->where)
                         if (!(m->where = unit_name_to_path(u->id)))
                                 return -ENOMEM;