diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-06-27 14:34:24 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-06-27 14:34:24 +0200 |
| commit | a7480dbad22cfb3d34c9bef5af562d3ff9e0227e (patch) | |
| tree | bc18f2379afb7a3a172ccca94afc187ebe6d8840 | |
| parent | c48754ab3d0fa71bb4ac671a22ad25fa392a32e1 (diff) | |
core: rename system.preset to system-presets to follow naming scheme of other dirs in /usr/lib/systemd/
Thankfully nobody is using this yet, and presets aren't documented yet,
hence take the liberty to rename this.
| -rw-r--r-- | src/delta/delta.c | 4 | ||||
| -rw-r--r-- | src/shared/install.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/delta/delta.c b/src/delta/delta.c index 4694fc8bc0..01c6335315 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -453,8 +453,8 @@ int main(int argc, char *argv[]) { "binfmt.d\0" "systemd/system\0" "systemd/user\0" - "systemd/system.preset\0" - "systemd/user.preset\0" + "systemd/system-preset\0" + "systemd/user-preset\0" "udev/rules.d\0" "modprobe.d\0"; diff --git a/src/shared/install.c b/src/shared/install.c index 718ec52769..13ae9a976f 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -1683,18 +1683,18 @@ int unit_file_query_preset(UnitFileScope scope, const char *name) { if (scope == UNIT_FILE_SYSTEM) r = conf_files_list(&files, ".preset", - "/etc/systemd/system.preset", - "/usr/local/lib/systemd/system.preset", - "/usr/lib/systemd/system.preset", + "/etc/systemd/system-preset", + "/usr/local/lib/systemd/system-preset", + "/usr/lib/systemd/system-preset", #ifdef HAVE_SPLIT_USR - "/lib/systemd/system.preset", + "/lib/systemd/system-preset", #endif NULL); else if (scope == UNIT_FILE_GLOBAL) r = conf_files_list(&files, ".preset", - "/etc/systemd/user.preset", - "/usr/local/lib/systemd/user.preset", - "/usr/lib/systemd/user.preset", + "/etc/systemd/user-preset", + "/usr/local/lib/systemd/user-preset", + "/usr/lib/systemd/user-preset", NULL); else return 1; |