35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From 81fc054dc7c365545bca86d78bf36a12658cedb3 Mon Sep 17 00:00:00 2001
|
|
From: Lukas Nykryn <lnykryn@redhat.com>
|
|
Date: Tue, 26 Aug 2014 13:33:08 +0200
|
|
Subject: [PATCH] systemctl: fix broken list-unit-files with --root
|
|
|
|
---
|
|
src/shared/install.c | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/shared/install.c b/src/shared/install.c
|
|
index 4b09a69456..3ef995a928 100644
|
|
--- a/src/shared/install.c
|
|
+++ b/src/shared/install.c
|
|
@@ -2072,6 +2072,7 @@ int unit_file_get_list(
|
|
for (;;) {
|
|
_cleanup_(unit_file_list_free_onep) UnitFileList *f = NULL;
|
|
struct dirent *de;
|
|
+ _cleanup_free_ char *path = NULL;
|
|
|
|
errno = 0;
|
|
de = readdir(d);
|
|
@@ -2121,7 +2122,11 @@ int unit_file_get_list(
|
|
goto found;
|
|
}
|
|
|
|
- r = unit_file_can_install(&paths, root_dir, f->path, true);
|
|
+ path = path_make_absolute(de->d_name, *i);
|
|
+ if (!path)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ r = unit_file_can_install(&paths, root_dir, path, true);
|
|
if (r == -EINVAL || /* Invalid setting? */
|
|
r == -EBADMSG || /* Invalid format? */
|
|
r == -ENOENT /* Included file not found? */)
|