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.
This commit is contained in:
@@ -218,8 +218,8 @@ static char** user_dirs(
|
||||
return tmp;
|
||||
}
|
||||
|
||||
char **generator_paths(SystemdRunningAs running_as) {
|
||||
if (running_as == SYSTEMD_USER)
|
||||
char **generator_paths(ManagerRunningAs running_as) {
|
||||
if (running_as == MANAGER_USER)
|
||||
return strv_new("/run/systemd/user-generators",
|
||||
"/etc/systemd/user-generators",
|
||||
"/usr/local/lib/systemd/user-generators",
|
||||
@@ -235,7 +235,7 @@ char **generator_paths(SystemdRunningAs running_as) {
|
||||
|
||||
int lookup_paths_init(
|
||||
LookupPaths *p,
|
||||
SystemdRunningAs running_as,
|
||||
ManagerRunningAs running_as,
|
||||
bool personal,
|
||||
const char *root_dir,
|
||||
const char *generator,
|
||||
@@ -277,7 +277,7 @@ int lookup_paths_init(
|
||||
* 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
|
||||
@@ -337,7 +337,7 @@ int lookup_paths_init(
|
||||
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 */
|
||||
|
||||
@@ -437,7 +437,7 @@ int lookup_paths_init_from_scope(LookupPaths *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);
|
||||
|
||||
@@ -33,20 +33,20 @@ typedef struct LookupPaths {
|
||||
#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(SystemdRunningAs running_as);
|
||||
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,
|
||||
|
||||
Reference in New Issue
Block a user