]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: don't reorder drop-ins when changing properties
authorLennart Poettering <lennart@poettering.net>
Fri, 26 Feb 2016 16:58:37 +0000 (17:58 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 12 Apr 2016 11:43:31 +0000 (13:43 +0200)
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...

src/core/unit.c

index f6c9891aad6b3ee2e8c028ab9521685d83a734fe..ac29353299dd05a17895b5e48892d0fc86b9df1f 100644 (file)
@@ -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);