chiark / gitweb /
core: rename system.preset to system-presets to follow naming scheme of other dirs...
authorLennart Poettering <lennart@poettering.net>
Wed, 27 Jun 2012 12:34:24 +0000 (14:34 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 27 Jun 2012 12:34:24 +0000 (14:34 +0200)
Thankfully nobody is using this yet, and presets aren't documented yet,
hence take the liberty to rename this.

src/delta/delta.c
src/shared/install.c

index 4694fc8..01c6335 100644 (file)
@@ -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";
 
index 718ec52..13ae9a9 100644 (file)
@@ -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;