From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 26 Feb 2016 16:58:37 +0000 (+0100)
Subject: core: don't reorder drop-ins when changing properties
X-Git-Tag: v230~185^2~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=193dc81ee336ad07b92e7e945b458eb24f615f55;p=thirdparty%2Fsystemd.git

core: don't reorder drop-ins when changing properties

The drop-in order we present should actually show what we is in effect, hence
let's not reorder it when writing changes. After all, just sorting
alphabetically is going to break things, as it doesn't respect that /etc breaks
/run breaks /usr...
---

diff --git a/src/core/unit.c b/src/core/unit.c
index f6c9891aad6..ac29353299d 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -3365,7 +3365,6 @@ int unit_write_drop_in(Unit *u, UnitSetPropertiesMode mode, const char *name, co
         if (r < 0)
                 return r;
 
-        strv_sort(u->dropin_paths);
         strv_uniq(u->dropin_paths);
 
         u->dropin_mtime = now(CLOCK_REALTIME);