From bb5f3e6410f426a468b522207bb5cd913f009230 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Wed, 15 May 2024 21:49:00 +0800 Subject: [PATCH] core/mount: correctly set DefaultDependencies=no for mounts from mountinfo Follow-up for 3c0a1b1e70c1fe6e0b6707fab7dc86b1500d0f82 Before this commit, DefaultDependencies=no is set in mount_add_extras(). However, when generating mount units from /proc/self/mountinfo, we don't have a unit in memory yet, and mount_setup_new_unit() doesn't call into mount_add_extras(). Fixes #32838 --- src/core/mount.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/mount.c b/src/core/mount.c index e43a93ac21e..ebafcafa923 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -604,6 +604,9 @@ static int mount_add_non_exec_dependencies(Mount *m) { if (!m->where) return 0; + if (mount_is_credentials(m)) + UNIT(m)->default_dependencies = false; + /* Adds in all dependencies directly responsible for ordering the mount, as opposed to dependencies * resulting from the ExecContext and such. */ @@ -650,9 +653,6 @@ static int mount_add_extras(Mount *m) { return r; } - if (mount_is_credentials(m)) - u->default_dependencies = false; - r = unit_patch_contexts(u); if (r < 0) return r; -- 2.47.3