summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVáclav Pavlín <vpavlin@redhat.com>2012-09-13 22:35:18 +0200
committerLennart Poettering <lennart@poettering.net>2012-09-13 22:35:18 +0200
commit37370d0cbe7c79d3f5b44a9ddbfac87c59dc09dd (patch)
treeda2500d11650950c9fca09ac66c0b7217b48329d /src
parent2fbe635a83a79f8889afec421ae3990ea106fb91 (diff)
install: append .service when enable/disable... is called
https://bugzilla.redhat.com/show_bug.cgi?id=856975
Diffstat (limited to 'src')
-rw-r--r--src/systemctl/systemctl.c32
1 files changed, 31 insertions, 1 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 55202c7ce0..dd835aa37a 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3551,6 +3551,28 @@ finish:
return r;
}
+static int mangle_names(char **original_names, char ***mangled_names) {
+ char **names_it = NULL;
+ char **name = NULL;
+
+ (*mangled_names) = new(char*, strv_length(original_names)+1);
+ if(!(*mangled_names))
+ return log_oom();
+
+ names_it = *mangled_names;
+
+ STRV_FOREACH(name, original_names) {
+ char *n = unit_name_mangle(*name);
+ (*names_it) = n ? n : strdup(*name);
+ if(!(*names_it))
+ return log_oom();
+ names_it++;
+ }
+ *names_it = NULL;
+
+ return 0;
+}
+
static int enable_unit(DBusConnection *bus, char **args) {
const char *verb = args[0];
UnitFileChange *changes = NULL;
@@ -3559,6 +3581,7 @@ static int enable_unit(DBusConnection *bus, char **args) {
DBusMessage *m = NULL, *reply = NULL;
int r;
DBusError error;
+ char **mangled_names = NULL;
r = enable_sysv_units(args);
if (r < 0)
@@ -3644,7 +3667,11 @@ static int enable_unit(DBusConnection *bus, char **args) {
dbus_message_iter_init_append(m, &iter);
- r = bus_append_strv_iter(&iter, args+1);
+ 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.");
goto finish;
@@ -3744,6 +3771,9 @@ finish:
unit_file_changes_free(changes, n_changes);
dbus_error_free(&error);
+
+ strv_free(mangled_names);
+
return r;
}