chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: rename SystemdRunningAs to ManagerRunningAs
[elogind.git]
/
src
/
shared
/
path-lookup.c
diff --git
a/src/shared/path-lookup.c
b/src/shared/path-lookup.c
index 291a2f4054e1a084242f3ba1d053eecd35f31542..f6a127174ca61a408c572738825d4878fde58db0 100644
(file)
--- a/
src/shared/path-lookup.c
+++ b/
src/shared/path-lookup.c
@@
-19,18
+19,16
@@
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"
+#include "install.h"
int user_config_home(char **config_home) {
const char *e;
int user_config_home(char **config_home) {
const char *e;
@@
-220,8
+218,8
@@
static char** user_dirs(
return tmp;
}
return tmp;
}
-char **generator_paths(
Systemd
RunningAs running_as) {
- if (running_as ==
SYSTEMD
_USER)
+char **generator_paths(
Manager
RunningAs running_as) {
+ if (running_as ==
MANAGER
_USER)
return strv_new("/run/systemd/user-generators",
"/etc/systemd/user-generators",
"/usr/local/lib/systemd/user-generators",
return strv_new("/run/systemd/user-generators",
"/etc/systemd/user-generators",
"/usr/local/lib/systemd/user-generators",
@@
-237,7
+235,7
@@
char **generator_paths(SystemdRunningAs running_as) {
int lookup_paths_init(
LookupPaths *p,
int lookup_paths_init(
LookupPaths *p,
-
Systemd
RunningAs running_as,
+
Manager
RunningAs running_as,
bool personal,
const char *root_dir,
const char *generator,
bool personal,
const char *root_dir,
const char *generator,
@@
-279,7
+277,7
@@
int lookup_paths_init(
* we include /lib in the search path for the system
* stuff but avoid it for user stuff. */
* we include /lib in the search path for the system
* stuff but avoid it for user stuff. */
- if (running_as ==
SYSTEMD
_USER) {
+ if (running_as ==
MANAGER
_USER) {
if (personal)
unit_path = user_dirs(generator, generator_early, generator_late);
else
if (personal)
unit_path = user_dirs(generator, generator_early, generator_late);
else
@@
-339,7
+337,7
@@
int lookup_paths_init(
p->unit_path = NULL;
}
p->unit_path = NULL;
}
- if (running_as ==
SYSTEMD
_SYSTEM) {
+ if (running_as ==
MANAGER
_SYSTEM) {
#ifdef HAVE_SYSV_COMPAT
/* /etc/init.d/ compatibility does not matter to users */
#ifdef HAVE_SYSV_COMPAT
/* /etc/init.d/ compatibility does not matter to users */
@@
-439,7
+437,7
@@
int lookup_paths_init_from_scope(LookupPaths *paths,
zero(*paths);
return lookup_paths_init(paths,
zero(*paths);
return lookup_paths_init(paths,
- scope == UNIT_FILE_SYSTEM ?
SYSTEMD_SYSTEM : SYSTEMD
_USER,
+ scope == UNIT_FILE_SYSTEM ?
MANAGER_SYSTEM : MANAGER
_USER,
scope == UNIT_FILE_USER,
root_dir,
NULL, NULL, NULL);
scope == UNIT_FILE_USER,
root_dir,
NULL, NULL, NULL);