chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
42aeb14
)
Revert "systemctl: fix broken list-unit-files with --root"
author
Lennart Poettering
<lennart@poettering.net>
Tue, 26 Aug 2014 02:03:24 +0000
(
04:03
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 26 Aug 2014 02:09:22 +0000
(
04:09
+0200)
This reverts commit
41a451cc2901a5deb985aea4cc8de204a22e5612
.
This breaks checks for masking of units file, since we invoke
null_or_empty_path() on the resulting path.
src/shared/install.c
patch
|
blob
|
history
diff --git
a/src/shared/install.c
b/src/shared/install.c
index a07d1dd31577a73172be3eeec7675c18ab374332..4b09a69456fd71fab4bf9c7bb113607d3747c9e2 100644
(file)
--- a/
src/shared/install.c
+++ b/
src/shared/install.c
@@
-2099,7
+2099,7
@@
int unit_file_get_list(
if (!f)
return -ENOMEM;
- f->path = path_make_absolute(de->d_name,
*i
);
+ f->path = path_make_absolute(de->d_name,
units_dir
);
if (!f->path)
return -ENOMEM;