Making libmount ingore autofs mounts by default can be a problem for systemd, I remember now what the problem was. autofs multi-mounts can be nested (and often are, think of a tree of NFS exports) where there are autofs file system mounts within NFS mounts and together with autofs mount triggers. In this case systemd needs to see all the mounts at shutdown when it is umounting the tree of mounts. We don't want to have to rely on modifications having been made to systemd for this to work properly so we can't make this the default behaviour in libmount. Fixes: 22147e08c987 (libmount: use autofs mount hint to ignore autofs mount entries) Signed-off-by: Ian Kent <raven@xxxxxxxxxx> Cc: John Westerdale <jwesterd@xxxxxxxxxx> Cc: Frank Hertz <fhirtz@xxxxxxxxxx> Cc: Frank Sorenson <fsorenso@xxxxxxxxxx> --- libmount/src/context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libmount/src/context.c b/libmount/src/context.c index 8db6b6950..2df4716a7 100644 --- a/libmount/src/context.c +++ b/libmount/src/context.c @@ -75,7 +75,7 @@ struct libmnt_context *mnt_new_context(void) /* if we're really root and aren't running setuid */ cxt->restricted = (uid_t) 0 == ruid && ruid == euid ? 0 : 1; - cxt->noautofs = 1; + cxt->noautofs = 0; DBG(CXT, ul_debugobj(cxt, "----> allocate %s", cxt->restricted ? "[RESTRICTED]" : "")); @@ -164,7 +164,7 @@ int mnt_reset_context(struct libmnt_context *cxt) cxt->helper = NULL; cxt->mountdata = NULL; cxt->flags = MNT_FL_DEFAULT; - cxt->noautofs = 1; + cxt->noautofs = 0; cxt->has_selinux_opt = 0; cxt->map_linux = mnt_get_builtin_optmap(MNT_LINUX_MAP);
