diff options
author | Lennart Poettering <lennart@poettering.net> | 2015-05-11 22:51:49 +0200 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 09:56:06 +0100 |
commit | 57ceb09c123ff52a2229413e5ac42a02d80089b6 (patch) | |
tree | fc3369d47510e74bc718fce244fc5c368045aa9e /src/shared/path-lookup.h | |
parent | 625299542476ecfbfc3a0452e2efe9a997aaf787 (diff) |
core: rename SystemdRunningAs to ManagerRunningAs
It's primarily just a property of the Manager object after all, and we
try to refer to PID 1 as "manager" instead of "systemd", hence let's to
stick to this here too.
Diffstat (limited to 'src/shared/path-lookup.h')
-rw-r--r-- | src/shared/path-lookup.h | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h index 3982974ba..31b2df3c1 100644 --- a/src/shared/path-lookup.h +++ b/src/shared/path-lookup.h @@ -27,20 +27,26 @@ typedef enum UnitFileScope UnitFileScope; typedef struct LookupPaths { char **unit_path; +#ifdef HAVE_SYSV_COMPAT + char **sysvinit_path; + char **sysvrcnd_path; +#endif } LookupPaths; -typedef enum SystemdRunningAs { - SYSTEMD_SYSTEM, - SYSTEMD_USER, - _SYSTEMD_RUNNING_AS_MAX, - _SYSTEMD_RUNNING_AS_INVALID = -1 -} SystemdRunningAs; +typedef enum ManagerRunningAs { + MANAGER_SYSTEM, + MANAGER_USER, + _MANAGER_RUNNING_AS_MAX, + _MANAGER_RUNNING_AS_INVALID = -1 +} ManagerRunningAs; int user_config_home(char **config_home); int user_runtime_dir(char **runtime_dir); +char **generator_paths(ManagerRunningAs running_as); + int lookup_paths_init(LookupPaths *p, - SystemdRunningAs running_as, + ManagerRunningAs running_as, bool personal, const char *root_dir, const char *generator, |