chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logs-show: fix check of loop_read_exact
[elogind.git]
/
src
/
shared
/
path-lookup.c
diff --git
a/src/shared/path-lookup.c
b/src/shared/path-lookup.c
index 1e5bb858e852d0325ff30089dc285601e9f68fd0..fbf46cd40690acee9cd336a508701d69dc2a8075 100644
(file)
--- a/
src/shared/path-lookup.c
+++ b/
src/shared/path-lookup.c
@@
-19,15
+19,12
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <unistd.h>
#include <errno.h>
#include "util.h"
#include <errno.h>
#include "util.h"
-#include "mkdir.h"
#include "strv.h"
#include "path-util.h"
#include "path-lookup.h"
#include "strv.h"
#include "path-util.h"
#include "path-lookup.h"
@@
-222,14
+219,14
@@
static char** user_dirs(
char **generator_paths(SystemdRunningAs running_as) {
if (running_as == SYSTEMD_USER)
char **generator_paths(SystemdRunningAs running_as) {
if (running_as == SYSTEMD_USER)
- return strv_new("/
etc
/systemd/user-generators",
- "/
run
/systemd/user-generators",
+ return strv_new("/
run
/systemd/user-generators",
+ "/
etc
/systemd/user-generators",
"/usr/local/lib/systemd/user-generators",
USER_GENERATOR_PATH,
NULL);
else
"/usr/local/lib/systemd/user-generators",
USER_GENERATOR_PATH,
NULL);
else
- return strv_new("/
etc
/systemd/system-generators",
- "/
run
/systemd/system-generators",
+ return strv_new("/
run
/systemd/system-generators",
+ "/
etc
/systemd/system-generators",
"/usr/local/lib/systemd/system-generators",
SYSTEM_GENERATOR_PATH,
NULL);
"/usr/local/lib/systemd/system-generators",
SYSTEM_GENERATOR_PATH,
NULL);