From e31165b26212b45e135fd4cd7d618a081d50bd28 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 18 Jan 2013 00:36:12 +0100 Subject: [PATCH] systemctl: make list-dependencies default to default.target --- man/systemctl.xml | 14 ++++++++------ src/systemctl/systemctl.c | 22 +++++++++++++--------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/man/systemctl.xml b/man/systemctl.xml index f22338371..60a0f401b 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -999,12 +999,14 @@ list-dependencies [NAME] - - Shows required and wanted units of given unit. - Target units are recursively expanded. - When is passed - dependency tree is generated for all - subsidiary units. + Shows required and + wanted units of the specified unit. If + no unit is specified + default.target is + implied. Target units are recursively + expanded. When + is passed all other units aare + recursively expanded as well. diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 003b70647..356854353 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -905,20 +905,24 @@ finish: } static int list_dependencies(DBusConnection *bus, char **args) { - int r = 0; _cleanup_free_ char *unit = NULL; + const char *u; assert(bus); - assert(args[1]); - unit = unit_name_mangle(args[1]); - if (!unit) - return log_oom(); + if (args[1]) { + unit = unit_name_mangle(args[1]); + if (!unit) + return log_oom(); + u = unit; + } else + u = SPECIAL_DEFAULT_TARGET; pager_open_if_enabled(); - printf("%s\n", unit); - r = list_dependencies_one(bus, unit, 0, NULL, 0); - return r; + + puts(u); + + return list_dependencies_one(bus, u, 0, NULL, 0); } static int dot_one_property(const char *name, const char *prop, DBusMessageIter *iter) { @@ -5301,7 +5305,7 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[], DBusError { "unmask", MORE, 2, enable_unit }, { "link", MORE, 2, enable_unit }, { "switch-root", MORE, 2, switch_root }, - { "list-dependencies", EQUAL, 2, list_dependencies }, + { "list-dependencies", LESS, 2, list_dependencies }, }; int left; -- 2.30.2