From: Václav Pavlín <vpav...@redhat.com>
Unit names were mangled in function enable_unit only when dbus was used.
This patch adds mangling also when the dbus is not in use.
---
src/systemctl/systemctl.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 8aadf85..5cffd83 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4217,27 +4217,31 @@ static int enable_unit(DBusConnection *bus, char
**args) {
if (!args[1] && !streq(verb, "default-target"))
return 0;
+ r = mangle_names(args+1, &mangled_names);
+ if (r < 0)
+ goto finish;
+
if (!bus || avoid_bus()) {
if (streq(verb, "enable")) {
- r = unit_file_enable(arg_scope, arg_runtime, arg_root,
args+1, arg_force, &changes, &n_changes);
+ r = unit_file_enable(arg_scope, arg_runtime, arg_root,
mangled_names, arg_force, &changes, &n_changes);
carries_install_info = r;
} else if (streq(verb, "disable"))
- r = unit_file_disable(arg_scope, arg_runtime,
arg_root, args+1, &changes, &n_changes);
+ r = unit_file_disable(arg_scope, arg_runtime,
arg_root, mangled_names, &changes, &n_changes);
else if (streq(verb, "reenable")) {
- r = unit_file_reenable(arg_scope, arg_runtime,
arg_root, args+1, arg_force, &changes, &n_changes);
+ r = unit_file_reenable(arg_scope, arg_runtime,
arg_root, mangled_names, arg_force, &changes, &n_changes);
carries_install_info = r;
} else if (streq(verb, "link"))
- r = unit_file_link(arg_scope, arg_runtime, arg_root,
args+1, arg_force, &changes, &n_changes);
+ r = unit_file_link(arg_scope, arg_runtime, arg_root,
mangled_names, arg_force, &changes, &n_changes);
else if (streq(verb, "preset")) {
- r = unit_file_preset(arg_scope, arg_runtime, arg_root,
args+1, arg_force, &changes, &n_changes);
+ r = unit_file_preset(arg_scope, arg_runtime, arg_root,
mangled_names, arg_force, &changes, &n_changes);
carries_install_info = r;
} else if (streq(verb, "mask"))
- r = unit_file_mask(arg_scope, arg_runtime, arg_root,
args+1, arg_force, &changes, &n_changes);
+ r = unit_file_mask(arg_scope, arg_runtime, arg_root,
mangled_names, arg_force, &changes, &n_changes);
else if (streq(verb, "unmask"))
- r = unit_file_unmask(arg_scope, arg_runtime, arg_root,
args+1, &changes, &n_changes);
+ r = unit_file_unmask(arg_scope, arg_runtime, arg_root,
mangled_names, &changes, &n_changes);
else if (streq(verb, "default-target")) {
if(args[1])
- r = unit_file_set_default(arg_scope, arg_root,
args[1], &changes, &n_changes);
+ r = unit_file_set_default(arg_scope, arg_root,
mangled_names[1], &changes, &n_changes);
else
r = unit_file_get_default(arg_scope, arg_root,
&changes, &n_changes);
@@ -4306,10 +4310,6 @@ static int enable_unit(DBusConnection *bus, char **args)
{
dbus_message_iter_init_append(m, &iter);
- r = mangle_names(args+1, &mangled_names);
- if (r < 0)
- goto finish;
-
r = bus_append_strv_iter(&iter, mangled_names);
if (r < 0) {
log_error("Failed to append unit files.");
--
1.8.1.4
_______________________________________________
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
