chiark / gitweb /
systemctl: fix broken list-unit-files with --root
authorLukas Nykryn <lnykryn@redhat.com>
Tue, 26 Aug 2014 11:33:08 +0000 (13:33 +0200)
committerLukas Nykryn <lnykryn@redhat.com>
Wed, 27 Aug 2014 09:48:48 +0000 (11:48 +0200)
src/shared/install.c

index 4b09a69456fd71fab4bf9c7bb113607d3747c9e2..3ef995a9285acd661ec22056810d93de97f230d8 100644 (file)
@@ -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? */)