diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-07-04 04:55:33 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-07-04 04:55:33 +0200 |
| commit | 5bd0707340570f48675a53f5dec8dd34b162e415 (patch) | |
| tree | 114026c2b38b106da97025bfa73184a0e49ad9ec /src | |
| parent | f295f5c0c0a31afd1914adf5d8a4d7f51e8e0be0 (diff) | |
dbus: complete automount and mount unit coverage
Diffstat (limited to 'src')
| -rw-r--r-- | src/dbus-automount.c | 4 | ||||
| -rw-r--r-- | src/dbus-mount.c | 16 | ||||
| -rw-r--r-- | src/systemctl.c | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/src/dbus-automount.c b/src/dbus-automount.c index 61732f989f..ada2d22ca3 100644 --- a/src/dbus-automount.c +++ b/src/dbus-automount.c @@ -25,6 +25,7 @@ #define BUS_AUTOMOUNT_INTERFACE \ " <interface name=\"org.freedesktop.systemd1.Automount\">\n" \ " <property name=\"Where\" type=\"s\" access=\"read\"/>\n" \ + " <property name=\"DirectoryMode\" type=\"u\" access=\"read\"/>\n" \ " </interface>\n" #define INTROSPECTION \ @@ -41,7 +42,8 @@ const char bus_automount_interface[] = BUS_AUTOMOUNT_INTERFACE; DBusHandlerResult bus_automount_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) { const BusProperty properties[] = { BUS_UNIT_PROPERTIES, - { "org.freedesktop.systemd1.Automount", "Where", bus_property_append_string, "s", u->automount.where }, + { "org.freedesktop.systemd1.Automount", "Where", bus_property_append_string, "s", u->automount.where }, + { "org.freedesktop.systemd1.Automount", "DirectoryMode", bus_property_append_mode, "u", &u->automount.directory_mode }, { NULL, NULL, NULL, NULL, NULL } }; diff --git a/src/dbus-mount.c b/src/dbus-mount.c index 0f417e76db..5e17ec2ef5 100644 --- a/src/dbus-mount.c +++ b/src/dbus-mount.c @@ -35,6 +35,7 @@ BUS_EXEC_CONTEXT_INTERFACE \ " <property name=\"KillMode\" type=\"s\" access=\"read\"/>\n" \ " <property name=\"ControlPID\" type=\"u\" access=\"read\"/>\n" \ + " <property name=\"DirectoryMode\" type=\"u\" access=\"read\"/>\n" \ " </interface>\n" #define INTROSPECTION \ @@ -123,15 +124,16 @@ static int bus_mount_append_type(Manager *n, DBusMessageIter *i, const char *pro DBusHandlerResult bus_mount_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) { const BusProperty properties[] = { BUS_UNIT_PROPERTIES, - { "org.freedesktop.systemd1.Mount", "Where", bus_property_append_string, "s", u->mount.where }, - { "org.freedesktop.systemd1.Mount", "What", bus_mount_append_what, "s", u }, - { "org.freedesktop.systemd1.Mount", "Options", bus_mount_append_options, "s", u }, - { "org.freedesktop.systemd1.Mount", "Type", bus_mount_append_type, "s", u }, - { "org.freedesktop.systemd1.Mount", "TimeoutUSec", bus_property_append_usec, "t", &u->mount.timeout_usec }, + { "org.freedesktop.systemd1.Mount", "Where", bus_property_append_string, "s", u->mount.where }, + { "org.freedesktop.systemd1.Mount", "What", bus_mount_append_what, "s", u }, + { "org.freedesktop.systemd1.Mount", "Options", bus_mount_append_options, "s", u }, + { "org.freedesktop.systemd1.Mount", "Type", bus_mount_append_type, "s", u }, + { "org.freedesktop.systemd1.Mount", "TimeoutUSec", bus_property_append_usec, "t", &u->mount.timeout_usec }, /* ExecCommand */ BUS_EXEC_CONTEXT_PROPERTIES("org.freedesktop.systemd1.Mount", u->mount.exec_context), - { "org.freedesktop.systemd1.Mount", "KillMode", bus_unit_append_kill_mode, "s", &u->mount.kill_mode }, - { "org.freedesktop.systemd1.Mount", "ControlPID", bus_property_append_pid, "u", &u->mount.control_pid }, + { "org.freedesktop.systemd1.Mount", "KillMode", bus_unit_append_kill_mode, "s", &u->mount.kill_mode }, + { "org.freedesktop.systemd1.Mount", "ControlPID", bus_property_append_pid, "u", &u->mount.control_pid }, + { "org.freedesktop.systemd1.Mount", "DirectoryMode", bus_property_append_mode, "u", &u->mount.directory_mode }, { NULL, NULL, NULL, NULL, NULL } }; diff --git a/src/systemctl.c b/src/systemctl.c index dddd689332..66d6ef038b 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -1039,7 +1039,7 @@ static int print_property(const char *name, DBusMessageIter *iter) { uint32_t u; dbus_message_iter_get_basic(iter, &u); - if (strstr(name, "UMask")) + if (strstr(name, "UMask") || strstr(name, "Mode")) printf("%s=%04o\n", name, u); else printf("%s=%u\n", name, (unsigned) u); |