9fc3254595
- Update of patch 0001-detect-s390-virt.patch (bnc#880438) - Shut up stupid check scripts crying for not mentioned systemd-mini-rpmlintrc - Add upstream patchs 0001-core-use-correct-format-string-for-UIDs.patch 0002-core-transaction-fix-cycle-break-attempts-outside-tr.patch 0003-fsck-consider-a-fsck-implementation-linked-to-bin-tr.patch - Add upstream patch 0001-units-order-network-online.target-after-network.targ.patch to make sure that etwork-online.target follows network.target - rules: re-enable dev_id conditionally in persistent rules (bnc#884403 and bnc#882714). Add 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch - Add upstream patches 0001-vconsole-also-copy-character-maps-not-just-fonts-fro.patch 0002-core-make-sure-Environment-fields-passed-in-for-tran.patch 0003-core-You-can-not-put-the-cached-result-of-use_smack-.patch 0004-cryptsetup-don-t-add-unit-dependency-on-dev-null-dev.patch 0005-man-fix-path-in-crypttab-5.patch - Add upstream patch 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch it fixes udevadm settle exit code which may had roken dracut scripts (bnc#884271 comment#18) - Temporary disable patch 1022 (bnc#884271 and bnc#882714). OBS-URL: https://build.opensuse.org/request/show/238853 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=190
116 lines
3.3 KiB
Diff
116 lines
3.3 KiB
Diff
From 0e252f6b375af59eac9bd6d2fe8dd6ee2f51998d Mon Sep 17 00:00:00 2001
|
|
From: Tom Gundersen <teg@jklm.no>
|
|
Date: Fri, 6 Jun 2014 15:10:20 +0200
|
|
Subject: [PATCH] core: allow transient mount units
|
|
|
|
For now only What=, Options=, Type= are supported, and Where= is deduced
|
|
from the unit name.
|
|
---
|
|
src/core/dbus-mount.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++-
|
|
src/core/mount.c | 2 ++
|
|
2 files changed, 65 insertions(+), 1 deletion(-)
|
|
|
|
diff --git src/core/dbus-mount.c src/core/dbus-mount.c
|
|
index e64d3ea..e27019d 100644
|
|
--- src/core/dbus-mount.c
|
|
+++ 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 src/core/mount.c src/core/mount.c
|
|
index a979837..14ac0a0 100644
|
|
--- src/core/mount.c
|
|
+++ 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,
|
|
|
|
--
|
|
1.7.9.2
|
|
|