chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v225: Applying various fixes and changes to src/libelogind/sd-bus that got lost...
[elogind.git]
/
src
/
shared
/
path-lookup.h
diff --git
a/src/shared/path-lookup.h
b/src/shared/path-lookup.h
index 8da076a30b0062513e545bb820724d58d2478916..3982974bad9638cfb2253003881cf9aa490f7617 100644
(file)
--- a/
src/shared/path-lookup.h
+++ b/
src/shared/path-lookup.h
@@
-23,12
+23,10
@@
#include "macro.h"
#include "macro.h"
+typedef enum UnitFileScope UnitFileScope;
+
typedef struct LookupPaths {
char **unit_path;
typedef struct LookupPaths {
char **unit_path;
-#ifdef HAVE_SYSV_COMPAT
- char **sysvinit_path;
- char **sysvrcnd_path;
-#endif
} LookupPaths;
typedef enum SystemdRunningAs {
} LookupPaths;
typedef enum SystemdRunningAs {
@@
-39,7
+37,7
@@
typedef enum SystemdRunningAs {
} SystemdRunningAs;
int user_config_home(char **config_home);
} SystemdRunningAs;
int user_config_home(char **config_home);
-int user_runtime
(char **user_runtime_path
);
+int user_runtime
_dir(char **runtime_dir
);
int lookup_paths_init(LookupPaths *p,
SystemdRunningAs running_as,
int lookup_paths_init(LookupPaths *p,
SystemdRunningAs running_as,
@@
-49,5
+47,8
@@
int lookup_paths_init(LookupPaths *p,
const char *generator_early,
const char *generator_late);
void lookup_paths_free(LookupPaths *p);
const char *generator_early,
const char *generator_late);
void lookup_paths_free(LookupPaths *p);
+int lookup_paths_init_from_scope(LookupPaths *paths,
+ UnitFileScope scope,
+ const char *root_dir);
#define _cleanup_lookup_paths_free_ _cleanup_(lookup_paths_free)
#define _cleanup_lookup_paths_free_ _cleanup_(lookup_paths_free)