summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-03-04 18:34:56 +0100
committerLennart Poettering <lennart@poettering.net>2011-03-04 18:34:56 +0100
commit09bde77fc798fb0f80714b77b958f24a3c2d798e (patch)
tree3c5d0d7d6c94dfb327543d08be85f3cfaa522924
parentf1779fd27b49d7ac9e04e0e83daf5f5f3efd9d8a (diff)
dbus: expose distribution name and features on manager object as properties
-rw-r--r--TODO4
-rw-r--r--src/dbus-manager.c6
2 files changed, 9 insertions, 1 deletions
diff --git a/TODO b/TODO
index 14060a5112..43ac165bb2 100644
--- a/TODO
+++ b/TODO
@@ -16,6 +16,10 @@ F15:
Features:
+* guarantee /etc/machineid
+
+* add "tainted" flag to systemctl show output
+
* introduce "x-systemd-automount" as alternative to the "comment=systemd.automount" mount option
* show failure error string in "systemctl status"
diff --git a/src/dbus-manager.c b/src/dbus-manager.c
index 1b3bddc348..9b6cda8af5 100644
--- a/src/dbus-manager.c
+++ b/src/dbus-manager.c
@@ -26,6 +26,7 @@
#include "dbus-manager.h"
#include "strv.h"
#include "bus-errors.h"
+#include "build.h"
#define BUS_MANAGER_INTERFACE_BEGIN \
" <interface name=\"org.freedesktop.systemd1.Manager\">\n"
@@ -146,9 +147,10 @@
" <arg name=\"result\" type=\"s\"/>\n" \
" </signal>"
-
#define BUS_MANAGER_INTERFACE_PROPERTIES_GENERAL \
" <property name=\"Version\" type=\"s\" access=\"read\"/>\n" \
+ " <property name=\"Distribution\" type=\"s\" access=\"read\"/>\n" \
+ " <property name=\"Features\" type=\"s\" access=\"read\"/\n" \
" <property name=\"RunningAs\" type=\"s\" access=\"read\"/>\n" \
" <property name=\"InitRDTimestamp\" type=\"t\" access=\"read\"/>\n" \
" <property name=\"StartupTimestamp\" type=\"t\" access=\"read\"/>\n" \
@@ -305,6 +307,8 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
const BusProperty properties[] = {
{ "org.freedesktop.systemd1.Manager", "Version", bus_property_append_string, "s", PACKAGE_STRING },
+ { "org.freedesktop.systemd1.Manager", "Distribution", bus_property_append_string, "s", DISTRIBUTION },
+ { "org.freedesktop.systemd1.Manager", "Features", bus_property_append_string, "s", SYSTEMD_FEATURES },
{ "org.freedesktop.systemd1.Manager", "RunningAs", bus_manager_append_running_as, "s", &m->running_as },
{ "org.freedesktop.systemd1.Manager", "InitRDTimestamp", bus_property_append_uint64, "t", &m->initrd_timestamp.realtime },
{ "org.freedesktop.systemd1.Manager", "StartupTimestamp", bus_property_append_uint64, "t", &m->startup_timestamp.realtime },