shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-24 06:04:05 +03:00
Code

core: rename system.preset to system-presets to follow naming scheme of other dirs in /usr/lib/systemd/

Browse Source 
Thankfully nobody is using this yet, and presets aren't documented yet,
hence take the liberty to rename this.
This commit is contained in:
Lennart Poettering 2012-06-27 14:34:24 +02:00
parent c48754ab3d
commit a7480dbad2
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/delta/delta.c
View 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";

14
src/shared/install.c
View 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;