chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: support "udevadm info /dev/sda; udevadm info /sys/class/block/sda"
[elogind.git]
/
src
/
shared
/
install.c
diff --git
a/src/shared/install.c
b/src/shared/install.c
index d6644e580fbf16cc904bfe92ec4837a7a347d389..40b137e437fecee8045fef4addc31e929732f489 100644
(file)
--- a/
src/shared/install.c
+++ b/
src/shared/install.c
@@
-60,7
+60,8
@@
static int lookup_paths_init_from_scope(LookupPaths *paths, UnitFileScope scope)
return lookup_paths_init(paths,
scope == UNIT_FILE_SYSTEM ? MANAGER_SYSTEM : MANAGER_USER,
return lookup_paths_init(paths,
scope == UNIT_FILE_SYSTEM ? MANAGER_SYSTEM : MANAGER_USER,
- scope == UNIT_FILE_USER);
+ scope == UNIT_FILE_USER,
+ NULL, NULL, NULL);
}
static int get_config_path(UnitFileScope scope, bool runtime, const char *root_dir, char **ret) {
}
static int get_config_path(UnitFileScope scope, bool runtime, const char *root_dir, char **ret) {
@@
-1150,7
+1151,7
@@
static int create_symlink(
assert(old_path);
assert(new_path);
assert(old_path);
assert(new_path);
- mkdir_parents(new_path, 0755);
+ mkdir_parents
_label
(new_path, 0755);
if (symlink(old_path, new_path) >= 0) {
add_file_change(changes, n_changes, UNIT_FILE_SYMLINK, new_path, old_path);
if (symlink(old_path, new_path) >= 0) {
add_file_change(changes, n_changes, UNIT_FILE_SYMLINK, new_path, old_path);