From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 4 Mar 2011 17:34:56 +0000 (+0100)
Subject: dbus: expose distribution name and features on manager object as properties
X-Git-Tag: v20~25
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=09bde77fc798fb0f80714b77b958f24a3c2d798e;ds=sidebyside

dbus: expose distribution name and features on manager object as properties
---

diff --git a/TODO b/TODO
index 14060a511..43ac165bb 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 1b3bddc34..9b6cda8af 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 },