mirror of
https://github.com/clearlinux/systemd-stable.git
synced 2026-10-18 14:23:53 +00:00
systemctl: fail in the case that no unit files were found
Previously systemctl died with message
-bash-4.2# systemctl --root /rawhi list-unit-files
(src/systemctl/systemctl.c:868) Out of memory.
in the case that no unit files were found in the --root
or the directory did not exist.
So lets return ENOENT in the case that --root does not exist
and empty list in the case that there are no unit files.
(cherry picked from commit fdbdf6ec29)
This commit is contained in:
committed by
Zbigniew Jędrzejewski-Szmek
parent
ce6ad4396d
commit
2865a5d66d
@@ -1921,6 +1921,12 @@ int unit_file_get_list(
|
||||
if (root_dir && scope != UNIT_FILE_SYSTEM)
|
||||
return -EINVAL;
|
||||
|
||||
if (root_dir) {
|
||||
r = access(root_dir, F_OK);
|
||||
if (r < 0)
|
||||
return -errno;
|
||||
}
|
||||
|
||||
r = lookup_paths_init_from_scope(&paths, scope, root_dir);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@@ -865,6 +865,10 @@ static int list_unit_files(DBusConnection *bus, char **args) {
|
||||
}
|
||||
|
||||
n_units = hashmap_size(h);
|
||||
|
||||
if (n_units == 0)
|
||||
return 0;
|
||||
|
||||
units = new(UnitFileList, n_units);
|
||||
if (!units) {
|
||||
unit_file_list_free(h);
|
||||
|
||||
Reference in New Issue
Block a user