chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: call udev_device_get_is_initialized() to trigger lazy loading, as a temporary...
[elogind.git]
/
src
/
path-lookup.c
diff --git
a/src/path-lookup.c
b/src/path-lookup.c
index e5533c04d9aa8ba9567f83c55bb7bdc0e6c773e1..b45467c98df35f6ce6476c50d6dd8d282e40fb8d 100644
(file)
--- a/
src/path-lookup.c
+++ b/
src/path-lookup.c
@@
-190,12
+190,10
@@
int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as) {
"/run/systemd/system",
SYSTEM_CONFIG_UNIT_PATH,
"/etc/systemd/system",
"/run/systemd/system",
SYSTEM_CONFIG_UNIT_PATH,
"/etc/systemd/system",
- "/usr/local/share/systemd/system",
"/usr/local/lib/systemd/system",
"/usr/local/lib/systemd/system",
- "/usr/share/systemd/system",
"/usr/lib/systemd/system",
"/usr/lib/systemd/system",
- SYSTEM_DATA_UNIT_PATH,
"/lib/systemd/system",
"/lib/systemd/system",
+ SYSTEM_DATA_UNIT_PATH,
NULL)))
return -ENOMEM;
}
NULL)))
return -ENOMEM;
}
@@
-205,6
+203,7
@@
int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as) {
return -ENOMEM;
strv_uniq(p->unit_path);
return -ENOMEM;
strv_uniq(p->unit_path);
+ strv_path_remove_empty(p->unit_path);
if (!strv_isempty(p->unit_path)) {
if (!strv_isempty(p->unit_path)) {
@@
-259,6
+258,9
@@
int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as) {
strv_uniq(p->sysvinit_path);
strv_uniq(p->sysvrcnd_path);
strv_uniq(p->sysvinit_path);
strv_uniq(p->sysvrcnd_path);
+ strv_path_remove_empty(p->sysvinit_path);
+ strv_path_remove_empty(p->sysvrcnd_path);
+
if (!strv_isempty(p->sysvinit_path)) {
if (!(t = strv_join(p->sysvinit_path, "\n\t")))
if (!strv_isempty(p->sysvinit_path)) {
if (!(t = strv_join(p->sysvinit_path, "\n\t")))