diff options
author | Sven Eden <yamakuzure@gmx.net> | 2017-01-04 06:40:46 +0100 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 10:18:48 +0100 |
commit | ba812e282b3406f478e8ede2b6eb885f61fae6fc (patch) | |
tree | c8847a4d4eea92b9662c6713d53408ff06a0836c /src/shared/path-lookup.h | |
parent | 1b99ea27bc3ffa1fc6f7cfe89563d891a9aed4c5 (diff) |
Prep v225: Applying various fixes and changes to src/shared that got lost during git am transfer.
Diffstat (limited to 'src/shared/path-lookup.h')
-rw-r--r-- | src/shared/path-lookup.h | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h index 3982974ba..e35c8d3c0 100644 --- a/src/shared/path-lookup.h +++ b/src/shared/path-lookup.h @@ -23,32 +23,39 @@ #include "macro.h" -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, const char *generator_early, const char *generator_late); -void lookup_paths_free(LookupPaths *p); + +#include "install.h" + int lookup_paths_init_from_scope(LookupPaths *paths, UnitFileScope scope, const char *root_dir); +void lookup_paths_free(LookupPaths *p); #define _cleanup_lookup_paths_free_ _cleanup_(lookup_paths_free) |