core/unit: re-find dropin paths of a unit after writting settings

Fixes: ab932a622d57 ("core: simplify unit_need_daemon_reload() a bit")
Fixes #35710

Co-authored-by: Jian Wen <wenjianhn@gmail.com>

diff --git a/src/core/unit.c b/src/core/unit.c
index 5494d718e65b6d6e8c06d1aa9d7bb96a5ac00acc..535839e15c42242cb7f4302dc7bfa13e371c317b 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -4748,12 +4748,11 @@ int unit_write_setting(Unit *u, UnitWriteFlags flags, const char *name, const ch
         if (r < 0)
                 return r;
 
-        r = strv_push(&u->dropin_paths, q);
+        _cleanup_strv_free_ char **dropins = NULL;
+        r = unit_find_dropin_paths(u, /* use_unit_path_cache= */ true, &dropins);
         if (r < 0)
                 return r;
-        q = NULL;
-
-        strv_uniq(u->dropin_paths);
+        strv_free_and_replace(u->dropin_paths, dropins);
 
         u->dropin_mtime = now(CLOCK_REALTIME);
 

diff --git a/test/units/TEST-15-DROPIN.sh b/test/units/TEST-15-DROPIN.sh
index dd850f41e1f95d00b10af0035857a6d925b4fa32..e056786910d860e0c14054aa8fd4247665728abb 100755 (executable)
--- a/test/units/TEST-15-DROPIN.sh
+++ b/test/units/TEST-15-DROPIN.sh
@@ -712,6 +712,17 @@ EOF
     clear_units test15-a.service
 }
 
+testcase_order_dropin_paths_set_property() {
+    # For issue #35710.
+    echo "Testing the order of dropin paths that are created by set-property"
+
+    create_service test15-a
+    systemctl set-property test15-a DevicePolicy=strict DeviceAllow="char-* m"
+    check_ok test15-a NeedDaemonReload no
+
+    clear_units test15-a.service
+}
+
 run_testcases
 
 touch /testok