diff options
author | Tom Gundersen <teg@jklm.no> | 2014-06-06 15:10:20 +0200 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2014-06-07 00:22:19 +0200 |
commit | 0e252f6b375af59eac9bd6d2fe8dd6ee2f51998d (patch) | |
tree | 276e5c8182e0af6ec5293dbbf52adfa19dde9398 | |
parent | e5a1c18d706c4d5e16100fe4fb8a07a80f2fa339 (diff) |
core: allow transient mount units
For now only What=, Options=, Type= are supported, and Where= is deduced
from the unit name.
-rw-r--r-- | src/core/dbus-mount.c | 64 | ||||
-rw-r--r-- | src/core/mount.c | 2 |
2 files changed, 65 insertions, 1 deletions
diff --git a/src/core/dbus-mount.c b/src/core/dbus-mount.c index e64d3eaa5e..e27019d71a 100644 --- a/src/core/dbus-mount.c +++ b/src/core/dbus-mount.c @@ -124,6 +124,47 @@ const sd_bus_vtable bus_mount_vtable[] = { SD_BUS_VTABLE_END }; +static int bus_mount_set_transient_property( + Mount *m, + const char *name, + sd_bus_message *message, + UnitSetPropertiesMode mode, + sd_bus_error *error) { + + const char *new_property; + char **property; + char *p; + int r; + + assert(m); + assert(name); + assert(message); + + if (streq(name, "What")) + property = &m->parameters_fragment.what; + else if (streq(name, "Options")) + property = &m->parameters_fragment.options; + else if (streq(name, "Type")) + property = &m->parameters_fragment.fstype; + else + return 0; + + r = sd_bus_message_read(message, "s", &new_property); + if (r < 0) + return r; + + if (mode != UNIT_CHECK) { + p = strdup(new_property); + if (!p) + return -ENOMEM; + + free(*property); + *property = p; + } + + return 1; +} + int bus_mount_set_property( Unit *u, const char *name, @@ -132,12 +173,33 @@ int bus_mount_set_property( sd_bus_error *error) { Mount *m = MOUNT(u); + int r; assert(m); assert(name); assert(message); - return bus_cgroup_set_property(u, &m->cgroup_context, name, message, mode, error); + r = bus_cgroup_set_property(u, &m->cgroup_context, name, message, mode, error); + if (r != 0) + return r; + + if (u->transient && u->load_state == UNIT_STUB) { + /* This is a transient unit, let's load a little more */ + + r = bus_mount_set_transient_property(m, name, message, mode, error); + if (r != 0) + return r; + + r = bus_exec_context_set_transient_property(u, &m->exec_context, name, message, mode, error); + if (r != 0) + return r; + + r = bus_kill_context_set_transient_property(u, &m->kill_context, name, message, mode, error); + if (r != 0) + return r; + } + + return 0; } int bus_mount_commit_properties(Unit *u) { diff --git a/src/core/mount.c b/src/core/mount.c index a979837071..14ac0a060e 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -1819,6 +1819,8 @@ const UnitVTable mount_vtable = { .get_timeout = mount_get_timeout, + .can_transient = true, + .enumerate = mount_enumerate, .shutdown = mount_shutdown, |