From fd432a8943d6f70cc1cdcf8d750c9d42d09ca4ad Mon Sep 17 00:00:00 2001
From: kremlin <ian@kremlin.cc>
Date: Tue, 22 Jul 2014 16:27:05 -0500
Subject: organize configs in conf/ into new subdirectories

introspection xml -> conf/introspect-xml/
service files -> conf/service-files/
dbus policies -> conf/sysbus-policy/
---
 conf/hostnamed-dbus.conf                           |  14 --
 conf/hostnamed-ispect.xml                          |  48 -----
 conf/introspect-xml/hostnamed-ispect.xml           |  48 +++++
 conf/introspect-xml/localed-ispect.xml             |  31 +++
 conf/introspect-xml/logind-ispect.xml              | 235 +++++++++++++++++++++
 conf/introspect-xml/timedated-ispect.xml           |  39 ++++
 conf/localed-dbus.conf                             |  14 --
 conf/localed-ispect.xml                            |  31 ---
 conf/logind-dbus.conf                              | 132 ------------
 conf/logind-ispect.xml                             | 235 ---------------------
 conf/org.freedesktop.hostname1.service             |   3 -
 conf/org.freedesktop.locale1.service               |   3 -
 conf/org.freedesktop.login1                        |   3 -
 conf/org.freedesktop.timedate1.service             |   3 -
 .../org.freedesktop.hostname1.service              |   3 +
 conf/service-files/org.freedesktop.locale1.service |   3 +
 conf/service-files/org.freedesktop.login1.service  |   3 +
 .../org.freedesktop.timedate1.service              |   3 +
 conf/sysbus-policy/hostnamed-dbus.conf             |  14 ++
 conf/sysbus-policy/localed-dbus.conf               |  14 ++
 conf/sysbus-policy/logind-dbus.conf                | 132 ++++++++++++
 conf/sysbus-policy/timedated-dbus.conf             |  14 ++
 conf/timedated-dbus.conf                           |  14 --
 conf/timedated-ispect.xml                          |  39 ----
 24 files changed, 539 insertions(+), 539 deletions(-)
 delete mode 100644 conf/hostnamed-dbus.conf
 delete mode 100644 conf/hostnamed-ispect.xml
 create mode 100644 conf/introspect-xml/hostnamed-ispect.xml
 create mode 100644 conf/introspect-xml/localed-ispect.xml
 create mode 100644 conf/introspect-xml/logind-ispect.xml
 create mode 100644 conf/introspect-xml/timedated-ispect.xml
 delete mode 100644 conf/localed-dbus.conf
 delete mode 100644 conf/localed-ispect.xml
 delete mode 100644 conf/logind-dbus.conf
 delete mode 100644 conf/logind-ispect.xml
 delete mode 100644 conf/org.freedesktop.hostname1.service
 delete mode 100644 conf/org.freedesktop.locale1.service
 delete mode 100644 conf/org.freedesktop.login1
 delete mode 100644 conf/org.freedesktop.timedate1.service
 create mode 100644 conf/service-files/org.freedesktop.hostname1.service
 create mode 100644 conf/service-files/org.freedesktop.locale1.service
 create mode 100644 conf/service-files/org.freedesktop.login1.service
 create mode 100644 conf/service-files/org.freedesktop.timedate1.service
 create mode 100644 conf/sysbus-policy/hostnamed-dbus.conf
 create mode 100644 conf/sysbus-policy/localed-dbus.conf
 create mode 100644 conf/sysbus-policy/logind-dbus.conf
 create mode 100644 conf/sysbus-policy/timedated-dbus.conf
 delete mode 100644 conf/timedated-dbus.conf
 delete mode 100644 conf/timedated-ispect.xml

diff --git a/conf/hostnamed-dbus.conf b/conf/hostnamed-dbus.conf
deleted file mode 100644
index ea11b9d..0000000
--- a/conf/hostnamed-dbus.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?> 
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-        <policy user="root">
-                <allow own="org.freedesktop.hostname1"/>
-                <allow send_destination="org.freedesktop.hostname1"/>
-                <allow receive_sender="org.freedesktop.hostname1"/>
-        </policy>
-        <policy context="default">
-                <allow send_destination="org.freedesktop.hostname1"/>
-                <allow receive_sender="org.freedesktop.hostname1"/>
-        </policy>
-</busconfig>
diff --git a/conf/hostnamed-ispect.xml b/conf/hostnamed-ispect.xml
deleted file mode 100644
index bca38cf..0000000
--- a/conf/hostnamed-ispect.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-    <interface name="org.freedesktop.hostname1">
-        <property name="Hostname" type="s" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
-        </property>
-        <property name="StaticHostname" type="s" access="read" />
-        <property name="PrettyHostname" type="s" access="read" />
-        <property name="IconName" type="s" access="read" />
-        <property name="Chassis" type="s" access="read" />
-        <property name="KernelName" type="s" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
-        </property>
-        <property name="KernelRelease" type="s" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
-        </property>
-        <property name="KernelVersion" type="s" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
-        </property>
-        <property name="OperatingSystemPrettyName" type="s" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
-        </property>
-        <property name="OperatingSystemCPEName" type="s" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
-        </property>
-        <method name="SetHostname">
-            <arg type="s" direction="in" />
-            <arg type="b" direction="in" />
-        </method>
-        <method name="SetStaticHostname">
-            <arg type="s" direction="in" />
-            <arg type="b" direction="in" />
-        </method>
-        <method name="SetPrettyHostname">
-            <arg type="s" direction="in" />
-            <arg type="b" direction="in" />
-        </method>
-        <method name="SetIconName">
-            <arg type="s" direction="in" />
-            <arg type="b" direction="in" />
-        </method>
-        <method name="SetChassis">
-            <arg type="s" direction="in" />
-            <arg type="b" direction="in" />
-        </method>
-    </interface>
-</node>
diff --git a/conf/introspect-xml/hostnamed-ispect.xml b/conf/introspect-xml/hostnamed-ispect.xml
new file mode 100644
index 0000000..bca38cf
--- /dev/null
+++ b/conf/introspect-xml/hostnamed-ispect.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+    <interface name="org.freedesktop.hostname1">
+        <property name="Hostname" type="s" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+        </property>
+        <property name="StaticHostname" type="s" access="read" />
+        <property name="PrettyHostname" type="s" access="read" />
+        <property name="IconName" type="s" access="read" />
+        <property name="Chassis" type="s" access="read" />
+        <property name="KernelName" type="s" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+        </property>
+        <property name="KernelRelease" type="s" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+        </property>
+        <property name="KernelVersion" type="s" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+        </property>
+        <property name="OperatingSystemPrettyName" type="s" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+        </property>
+        <property name="OperatingSystemCPEName" type="s" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+        </property>
+        <method name="SetHostname">
+            <arg type="s" direction="in" />
+            <arg type="b" direction="in" />
+        </method>
+        <method name="SetStaticHostname">
+            <arg type="s" direction="in" />
+            <arg type="b" direction="in" />
+        </method>
+        <method name="SetPrettyHostname">
+            <arg type="s" direction="in" />
+            <arg type="b" direction="in" />
+        </method>
+        <method name="SetIconName">
+            <arg type="s" direction="in" />
+            <arg type="b" direction="in" />
+        </method>
+        <method name="SetChassis">
+            <arg type="s" direction="in" />
+            <arg type="b" direction="in" />
+        </method>
+    </interface>
+</node>
diff --git a/conf/introspect-xml/localed-ispect.xml b/conf/introspect-xml/localed-ispect.xml
new file mode 100644
index 0000000..7fa1dca
--- /dev/null
+++ b/conf/introspect-xml/localed-ispect.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+    <interface name="org.freedesktop.locale1">
+        <property name="Locale" type="as" access="read" />
+        <property name="X11Layout" type="s" access="read" />
+        <property name="X11Model" type="s" access="read" />
+        <property name="X11Variant" type="s" access="read" />
+        <property name="X11Options" type="s" access="read" />
+        <property name="VConsoleKeymap" type="s" access="read" />
+        <property name="VConsoleKeymapToggle" type="s" access="read" />
+        <method name="SetLocale">
+            <arg type="as" direction="in" />
+            <arg type="b" direction="in" />
+        </method>
+        <method name="SetVConsoleKeyboard">
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="b" direction="in" />
+            <arg type="b" direction="in" />
+        </method>
+        <method name="SetX11Keyboard">
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="b" direction="in" />
+            <arg type="b" direction="in" />
+        </method>
+    </interface>
+</node>
diff --git a/conf/introspect-xml/logind-ispect.xml b/conf/introspect-xml/logind-ispect.xml
new file mode 100644
index 0000000..25ff8ca
--- /dev/null
+++ b/conf/introspect-xml/logind-ispect.xml
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+    <interface name="org.freedesktop.login1.Manager">
+        <property name="NAutoVTs" type="u" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+        </property>
+        <property name="KillOnlyUsers" type="as" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+        </property>
+        <property name="KillExcludeUsers" type="as" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+        </property>
+        <property name="KillUserProcesses" type="b" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+        </property>
+        <property name="IdleHint" type="b" access="read" />
+        <property name="IdleSinceHint" type="t" access="read" />
+        <property name="IdleSinceHintMonotonic" type="t" access="read" />
+        <property name="BlockInhibited" type="s" access="read" />
+        <property name="DelayInhibited" type="s" access="read" />
+        <property name="InhibitDelayMaxUSec" type="t" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+        </property>
+        <property name="HandlePowerKey" type="s" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+        </property>
+        <property name="HandleSuspendKey" type="s" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+        </property>
+        <property name="HandleHibernateKey" type="s" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+        </property>
+        <property name="HandleLidSwitch" type="s" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+        </property>
+        <property name="IdleAction" type="s" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+        </property>
+        <property name="IdleActionUSec" type="t" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
+        </property>
+        <property name="PreparingForShutdown" type="b" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+        </property>
+        <property name="PreparingForSleep" type="b" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+        </property>
+        <method name="GetSession">
+            <arg type="s" direction="in" />
+            <arg type="o" direction="out" />
+        </method>
+        <method name="GetSessionByPID">
+            <arg type="u" direction="in" />
+            <arg type="o" direction="out" />
+        </method>
+        <method name="GetUser">
+            <arg type="u" direction="in" />
+            <arg type="o" direction="out" />
+        </method>
+        <method name="GetUserByPID">
+            <arg type="u" direction="in" />
+            <arg type="o" direction="out" />
+        </method>
+        <method name="GetSeat">
+            <arg type="s" direction="in" />
+            <arg type="o" direction="out" />
+        </method>
+        <method name="ListSessions">
+            <arg type="a(susso)" direction="out" />
+        </method>
+        <method name="ListUsers">
+            <arg type="a(uso)" direction="out" />
+        </method>
+        <method name="ListSeats">
+            <arg type="a(so)" direction="out" />
+        </method>
+        <method name="ListInhibitors">
+            <arg type="a(ssssuu)" direction="out" />
+        </method>
+        <method name="CreateSession">
+            <arg type="u" direction="in" />
+            <arg type="u" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="u" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="b" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="a(sv)" direction="in" />
+            <arg type="s" direction="out" />
+            <arg type="o" direction="out" />
+            <arg type="s" direction="out" />
+            <arg type="h" direction="out" />
+            <arg type="u" direction="out" />
+            <arg type="s" direction="out" />
+            <arg type="u" direction="out" />
+            <arg type="b" direction="out" />
+            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
+        </method>
+        <method name="ReleaseSession">
+            <arg type="s" direction="in" />
+            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
+        </method>
+        <method name="ActivateSession">
+            <arg type="s" direction="in" />
+        </method>
+        <method name="ActivateSessionOnSeat">
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+        </method>
+        <method name="LockSession">
+            <arg type="s" direction="in" />
+            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
+        </method>
+        <method name="UnlockSession">
+            <arg type="s" direction="in" />
+            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
+        </method>
+        <method name="LockSessions">
+            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
+        </method>
+        <method name="UnlockSessions">
+            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
+        </method>
+        <method name="KillSession">
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="i" direction="in" />
+            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
+        </method>
+        <method name="KillUser">
+            <arg type="u" direction="in" />
+            <arg type="i" direction="in" />
+            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
+        </method>
+        <method name="TerminateSession">
+            <arg type="s" direction="in" />
+            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
+        </method>
+        <method name="TerminateUser">
+            <arg type="u" direction="in" />
+            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
+        </method>
+        <method name="TerminateSeat">
+            <arg type="s" direction="in" />
+            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
+        </method>
+        <method name="SetUserLinger">
+            <arg type="u" direction="in" />
+            <arg type="b" direction="in" />
+            <arg type="b" direction="in" />
+        </method>
+        <method name="AttachDevice">
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="b" direction="in" />
+        </method>
+        <method name="FlushDevices">
+            <arg type="b" direction="in" />
+        </method>
+        <method name="PowerOff">
+            <arg type="b" direction="in" />
+        </method>
+        <method name="Reboot">
+            <arg type="b" direction="in" />
+        </method>
+        <method name="Suspend">
+            <arg type="b" direction="in" />
+        </method>
+        <method name="Hibernate">
+            <arg type="b" direction="in" />
+        </method>
+        <method name="HybridSleep">
+            <arg type="b" direction="in" />
+        </method>
+        <method name="CanPowerOff">
+            <arg type="s" direction="out" />
+        </method>
+        <method name="CanReboot">
+            <arg type="s" direction="out" />
+        </method>
+        <method name="CanSuspend">
+            <arg type="s" direction="out" />
+        </method>
+        <method name="CanHibernate">
+            <arg type="s" direction="out" />
+        </method>
+        <method name="CanHybridSleep">
+            <arg type="s" direction="out" />
+        </method>
+        <method name="Inhibit">
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="s" direction="in" />
+            <arg type="h" direction="out" />
+        </method>
+        <signal name="SessionNew">
+            <arg type="s" direction="in" />
+            <arg type="o" direction="in" />
+        </signal>
+        <signal name="SessionRemoved">
+            <arg type="s" direction="in" />
+            <arg type="o" direction="in" />
+        </signal>
+        <signal name="UserNew">
+            <arg type="u" direction="in" />
+            <arg type="o" direction="in" />
+        </signal>
+        <signal name="UserRemoved">
+            <arg type="u" direction="in" />
+            <arg type="o" direction="in" />
+        </signal>
+        <signal name="SeatNew">
+            <arg type="s" direction="in" />
+            <arg type="o" direction="in" />
+        </signal>
+        <signal name="SeatRemoved">
+            <arg type="s" direction="in" />
+            <arg type="o" direction="in" />
+        </signal>
+        <signal name="PrepareForShutdown">
+            <arg type="b" direction="in" />
+        </signal>
+        <signal name="PrepareForSleep">
+            <arg type="b" direction="in" />
+        </signal>
+    </interface>
+</node>
diff --git a/conf/introspect-xml/timedated-ispect.xml b/conf/introspect-xml/timedated-ispect.xml
new file mode 100644
index 0000000..5dc44ff
--- /dev/null
+++ b/conf/introspect-xml/timedated-ispect.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+    <interface name="org.freedesktop.timedate1">
+        <property name="Timezone" type="s" access="read" />
+        <property name="LocalRTC" type="b" access="read" />
+        <property name="CanNTP" type="b" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+        </property>
+        <property name="NTP" type="b" access="read" />
+        <property name="NTPSynchronized" type="b" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+        </property>
+        <property name="TimeUSec" type="t" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+        </property>
+        <property name="RTCTimeUSec" type="t" access="read">
+            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
+        </property>
+        <method name="SetTime">
+            <arg type="x" direction="in" />
+            <arg type="b" direction="in" />
+            <arg type="b" direction="in" />
+        </method>
+        <method name="SetTimezone">
+            <arg type="s" direction="in" />
+            <arg type="b" direction="in" />
+        </method>
+        <method name="SetLocalRTC">
+            <arg type="b" direction="in" />
+            <arg type="b" direction="in" />
+            <arg type="b" direction="in" />
+        </method>
+        <method name="SetNTP">
+            <arg type="b" direction="in" />
+            <arg type="b" direction="in" />
+        </method>
+    </interface>
+</node>
diff --git a/conf/localed-dbus.conf b/conf/localed-dbus.conf
deleted file mode 100644
index b7d8edd..0000000
--- a/conf/localed-dbus.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?> 
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-        <policy user="root">
-                <allow own="org.freedesktop.locale1"/>
-                <allow send_destination="org.freedesktop.locale1"/>
-                <allow receive_sender="org.freedesktop.locale1"/>
-        </policy>
-        <policy context="default">
-                <allow send_destination="org.freedesktop.locale1"/>
-                <allow receive_sender="org.freedesktop.locale1"/>
-        </policy>
-</busconfig>
diff --git a/conf/localed-ispect.xml b/conf/localed-ispect.xml
deleted file mode 100644
index 7fa1dca..0000000
--- a/conf/localed-ispect.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-    <interface name="org.freedesktop.locale1">
-        <property name="Locale" type="as" access="read" />
-        <property name="X11Layout" type="s" access="read" />
-        <property name="X11Model" type="s" access="read" />
-        <property name="X11Variant" type="s" access="read" />
-        <property name="X11Options" type="s" access="read" />
-        <property name="VConsoleKeymap" type="s" access="read" />
-        <property name="VConsoleKeymapToggle" type="s" access="read" />
-        <method name="SetLocale">
-            <arg type="as" direction="in" />
-            <arg type="b" direction="in" />
-        </method>
-        <method name="SetVConsoleKeyboard">
-            <arg type="s" direction="in" />
-            <arg type="s" direction="in" />
-            <arg type="b" direction="in" />
-            <arg type="b" direction="in" />
-        </method>
-        <method name="SetX11Keyboard">
-            <arg type="s" direction="in" />
-            <arg type="s" direction="in" />
-            <arg type="s" direction="in" />
-            <arg type="s" direction="in" />
-            <arg type="b" direction="in" />
-            <arg type="b" direction="in" />
-        </method>
-    </interface>
-</node>
diff --git a/conf/logind-dbus.conf b/conf/logind-dbus.conf
deleted file mode 100644
index c420ba4..0000000
--- a/conf/logind-dbus.conf
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-        <policy user="root">
-                <allow own="org.freedesktop.login1"/>
-                <allow send_destination="org.freedesktop.login1"/>
-                <allow receive_sender="org.freedesktop.login1"/>
-        </policy>
-        <policy context="default">
-                <deny send_destination="org.freedesktop.login1"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.DBus.Introspectable"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.DBus.Peer"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.DBus.Properties"
-                       send_member="Get"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.DBus.Properties"
-                       send_member="GetAll"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="GetSession"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="GetSessionByPID"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="GetUser"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="GetUserByPID"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="GetSeat"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="ListSessions"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="ListUsers"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="ListSeats"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="ListInhibitors"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="Inhibit"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="SetUserLinger"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="ActivateSession"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="ActivateSessionOnSeat"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="PowerOff"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="Reboot"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="Suspend"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="Hibernate"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="HybridSleep"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="CanPowerOff"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="CanReboot"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="CanSuspend"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="CanHibernate"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="CanHybridSleep"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="AttachDevice"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="FlushDevices"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Seat"
-                       send_member="ActivateSession"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Seat"
-                       send_member="SwitchTo"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Seat"
-                       send_member="SwitchToPrevious"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Seat"
-                       send_member="SwitchToNext"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Session"
-                       send_member="Activate"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Session"
-                       send_member="SetIdleHint"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Session"
-                       send_member="TakeControl"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Session"
-                       send_member="ReleaseControl"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Session"
-                       send_member="TakeDevice"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Session"
-                       send_member="ReleaseDevice"/>
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Session"
-                       send_member="PauseDeviceComplete"/>
-                <allow receive_sender="org.freedesktop.login1"/>
-        </policy>
-</busconfig>
diff --git a/conf/logind-ispect.xml b/conf/logind-ispect.xml
deleted file mode 100644
index 25ff8ca..0000000
--- a/conf/logind-ispect.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-    <interface name="org.freedesktop.login1.Manager">
-        <property name="NAutoVTs" type="u" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
-        </property>
-        <property name="KillOnlyUsers" type="as" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
-        </property>
-        <property name="KillExcludeUsers" type="as" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
-        </property>
-        <property name="KillUserProcesses" type="b" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
-        </property>
-        <property name="IdleHint" type="b" access="read" />
-        <property name="IdleSinceHint" type="t" access="read" />
-        <property name="IdleSinceHintMonotonic" type="t" access="read" />
-        <property name="BlockInhibited" type="s" access="read" />
-        <property name="DelayInhibited" type="s" access="read" />
-        <property name="InhibitDelayMaxUSec" type="t" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
-        </property>
-        <property name="HandlePowerKey" type="s" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
-        </property>
-        <property name="HandleSuspendKey" type="s" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
-        </property>
-        <property name="HandleHibernateKey" type="s" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
-        </property>
-        <property name="HandleLidSwitch" type="s" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
-        </property>
-        <property name="IdleAction" type="s" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
-        </property>
-        <property name="IdleActionUSec" type="t" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const" />
-        </property>
-        <property name="PreparingForShutdown" type="b" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
-        </property>
-        <property name="PreparingForSleep" type="b" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
-        </property>
-        <method name="GetSession">
-            <arg type="s" direction="in" />
-            <arg type="o" direction="out" />
-        </method>
-        <method name="GetSessionByPID">
-            <arg type="u" direction="in" />
-            <arg type="o" direction="out" />
-        </method>
-        <method name="GetUser">
-            <arg type="u" direction="in" />
-            <arg type="o" direction="out" />
-        </method>
-        <method name="GetUserByPID">
-            <arg type="u" direction="in" />
-            <arg type="o" direction="out" />
-        </method>
-        <method name="GetSeat">
-            <arg type="s" direction="in" />
-            <arg type="o" direction="out" />
-        </method>
-        <method name="ListSessions">
-            <arg type="a(susso)" direction="out" />
-        </method>
-        <method name="ListUsers">
-            <arg type="a(uso)" direction="out" />
-        </method>
-        <method name="ListSeats">
-            <arg type="a(so)" direction="out" />
-        </method>
-        <method name="ListInhibitors">
-            <arg type="a(ssssuu)" direction="out" />
-        </method>
-        <method name="CreateSession">
-            <arg type="u" direction="in" />
-            <arg type="u" direction="in" />
-            <arg type="s" direction="in" />
-            <arg type="s" direction="in" />
-            <arg type="s" direction="in" />
-            <arg type="s" direction="in" />
-            <arg type="s" direction="in" />
-            <arg type="u" direction="in" />
-            <arg type="s" direction="in" />
-            <arg type="s" direction="in" />
-            <arg type="b" direction="in" />
-            <arg type="s" direction="in" />
-            <arg type="s" direction="in" />
-            <arg type="a(sv)" direction="in" />
-            <arg type="s" direction="out" />
-            <arg type="o" direction="out" />
-            <arg type="s" direction="out" />
-            <arg type="h" direction="out" />
-            <arg type="u" direction="out" />
-            <arg type="s" direction="out" />
-            <arg type="u" direction="out" />
-            <arg type="b" direction="out" />
-            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
-        </method>
-        <method name="ReleaseSession">
-            <arg type="s" direction="in" />
-            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
-        </method>
-        <method name="ActivateSession">
-            <arg type="s" direction="in" />
-        </method>
-        <method name="ActivateSessionOnSeat">
-            <arg type="s" direction="in" />
-            <arg type="s" direction="in" />
-        </method>
-        <method name="LockSession">
-            <arg type="s" direction="in" />
-            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
-        </method>
-        <method name="UnlockSession">
-            <arg type="s" direction="in" />
-            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
-        </method>
-        <method name="LockSessions">
-            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
-        </method>
-        <method name="UnlockSessions">
-            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
-        </method>
-        <method name="KillSession">
-            <arg type="s" direction="in" />
-            <arg type="s" direction="in" />
-            <arg type="i" direction="in" />
-            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
-        </method>
-        <method name="KillUser">
-            <arg type="u" direction="in" />
-            <arg type="i" direction="in" />
-            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
-        </method>
-        <method name="TerminateSession">
-            <arg type="s" direction="in" />
-            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
-        </method>
-        <method name="TerminateUser">
-            <arg type="u" direction="in" />
-            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
-        </method>
-        <method name="TerminateSeat">
-            <arg type="s" direction="in" />
-            <annotation name="org.freedesktop.systemd1.Privileged" value="true" />
-        </method>
-        <method name="SetUserLinger">
-            <arg type="u" direction="in" />
-            <arg type="b" direction="in" />
-            <arg type="b" direction="in" />
-        </method>
-        <method name="AttachDevice">
-            <arg type="s" direction="in" />
-            <arg type="s" direction="in" />
-            <arg type="b" direction="in" />
-        </method>
-        <method name="FlushDevices">
-            <arg type="b" direction="in" />
-        </method>
-        <method name="PowerOff">
-            <arg type="b" direction="in" />
-        </method>
-        <method name="Reboot">
-            <arg type="b" direction="in" />
-        </method>
-        <method name="Suspend">
-            <arg type="b" direction="in" />
-        </method>
-        <method name="Hibernate">
-            <arg type="b" direction="in" />
-        </method>
-        <method name="HybridSleep">
-            <arg type="b" direction="in" />
-        </method>
-        <method name="CanPowerOff">
-            <arg type="s" direction="out" />
-        </method>
-        <method name="CanReboot">
-            <arg type="s" direction="out" />
-        </method>
-        <method name="CanSuspend">
-            <arg type="s" direction="out" />
-        </method>
-        <method name="CanHibernate">
-            <arg type="s" direction="out" />
-        </method>
-        <method name="CanHybridSleep">
-            <arg type="s" direction="out" />
-        </method>
-        <method name="Inhibit">
-            <arg type="s" direction="in" />
-            <arg type="s" direction="in" />
-            <arg type="s" direction="in" />
-            <arg type="s" direction="in" />
-            <arg type="h" direction="out" />
-        </method>
-        <signal name="SessionNew">
-            <arg type="s" direction="in" />
-            <arg type="o" direction="in" />
-        </signal>
-        <signal name="SessionRemoved">
-            <arg type="s" direction="in" />
-            <arg type="o" direction="in" />
-        </signal>
-        <signal name="UserNew">
-            <arg type="u" direction="in" />
-            <arg type="o" direction="in" />
-        </signal>
-        <signal name="UserRemoved">
-            <arg type="u" direction="in" />
-            <arg type="o" direction="in" />
-        </signal>
-        <signal name="SeatNew">
-            <arg type="s" direction="in" />
-            <arg type="o" direction="in" />
-        </signal>
-        <signal name="SeatRemoved">
-            <arg type="s" direction="in" />
-            <arg type="o" direction="in" />
-        </signal>
-        <signal name="PrepareForShutdown">
-            <arg type="b" direction="in" />
-        </signal>
-        <signal name="PrepareForSleep">
-            <arg type="b" direction="in" />
-        </signal>
-    </interface>
-</node>
diff --git a/conf/org.freedesktop.hostname1.service b/conf/org.freedesktop.hostname1.service
deleted file mode 100644
index c02d3c4..0000000
--- a/conf/org.freedesktop.hostname1.service
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Names=org.freedesktop.hostname1
-Exec=/usr/local/bin/systemd-compat/systemd-hostnamed
diff --git a/conf/org.freedesktop.locale1.service b/conf/org.freedesktop.locale1.service
deleted file mode 100644
index 22cd8c1..0000000
--- a/conf/org.freedesktop.locale1.service
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Names=org.freedesktop.locale1
-Exec=/usr/local/bin/systemd-compat/systemd-localed
diff --git a/conf/org.freedesktop.login1 b/conf/org.freedesktop.login1
deleted file mode 100644
index ec47461..0000000
--- a/conf/org.freedesktop.login1
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Names=org.freedesktop.login1
-Exec=/usr/local/bin/systemd-compat/systemd-logind
diff --git a/conf/org.freedesktop.timedate1.service b/conf/org.freedesktop.timedate1.service
deleted file mode 100644
index f757f4a..0000000
--- a/conf/org.freedesktop.timedate1.service
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Names=org.freedesktop.timedate1
-Exec=/usr/local/bin/systemd-compat/systemd-timedated
diff --git a/conf/service-files/org.freedesktop.hostname1.service b/conf/service-files/org.freedesktop.hostname1.service
new file mode 100644
index 0000000..c02d3c4
--- /dev/null
+++ b/conf/service-files/org.freedesktop.hostname1.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Names=org.freedesktop.hostname1
+Exec=/usr/local/bin/systemd-compat/systemd-hostnamed
diff --git a/conf/service-files/org.freedesktop.locale1.service b/conf/service-files/org.freedesktop.locale1.service
new file mode 100644
index 0000000..22cd8c1
--- /dev/null
+++ b/conf/service-files/org.freedesktop.locale1.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Names=org.freedesktop.locale1
+Exec=/usr/local/bin/systemd-compat/systemd-localed
diff --git a/conf/service-files/org.freedesktop.login1.service b/conf/service-files/org.freedesktop.login1.service
new file mode 100644
index 0000000..ec47461
--- /dev/null
+++ b/conf/service-files/org.freedesktop.login1.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Names=org.freedesktop.login1
+Exec=/usr/local/bin/systemd-compat/systemd-logind
diff --git a/conf/service-files/org.freedesktop.timedate1.service b/conf/service-files/org.freedesktop.timedate1.service
new file mode 100644
index 0000000..f757f4a
--- /dev/null
+++ b/conf/service-files/org.freedesktop.timedate1.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Names=org.freedesktop.timedate1
+Exec=/usr/local/bin/systemd-compat/systemd-timedated
diff --git a/conf/sysbus-policy/hostnamed-dbus.conf b/conf/sysbus-policy/hostnamed-dbus.conf
new file mode 100644
index 0000000..ea11b9d
--- /dev/null
+++ b/conf/sysbus-policy/hostnamed-dbus.conf
@@ -0,0 +1,14 @@
+<?xml version="1.0"?> 
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+        <policy user="root">
+                <allow own="org.freedesktop.hostname1"/>
+                <allow send_destination="org.freedesktop.hostname1"/>
+                <allow receive_sender="org.freedesktop.hostname1"/>
+        </policy>
+        <policy context="default">
+                <allow send_destination="org.freedesktop.hostname1"/>
+                <allow receive_sender="org.freedesktop.hostname1"/>
+        </policy>
+</busconfig>
diff --git a/conf/sysbus-policy/localed-dbus.conf b/conf/sysbus-policy/localed-dbus.conf
new file mode 100644
index 0000000..b7d8edd
--- /dev/null
+++ b/conf/sysbus-policy/localed-dbus.conf
@@ -0,0 +1,14 @@
+<?xml version="1.0"?> 
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+        <policy user="root">
+                <allow own="org.freedesktop.locale1"/>
+                <allow send_destination="org.freedesktop.locale1"/>
+                <allow receive_sender="org.freedesktop.locale1"/>
+        </policy>
+        <policy context="default">
+                <allow send_destination="org.freedesktop.locale1"/>
+                <allow receive_sender="org.freedesktop.locale1"/>
+        </policy>
+</busconfig>
diff --git a/conf/sysbus-policy/logind-dbus.conf b/conf/sysbus-policy/logind-dbus.conf
new file mode 100644
index 0000000..c420ba4
--- /dev/null
+++ b/conf/sysbus-policy/logind-dbus.conf
@@ -0,0 +1,132 @@
+<?xml version="1.0"?>
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+        <policy user="root">
+                <allow own="org.freedesktop.login1"/>
+                <allow send_destination="org.freedesktop.login1"/>
+                <allow receive_sender="org.freedesktop.login1"/>
+        </policy>
+        <policy context="default">
+                <deny send_destination="org.freedesktop.login1"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.DBus.Introspectable"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.DBus.Peer"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.DBus.Properties"
+                       send_member="Get"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.DBus.Properties"
+                       send_member="GetAll"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="GetSession"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="GetSessionByPID"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="GetUser"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="GetUserByPID"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="GetSeat"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="ListSessions"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="ListUsers"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="ListSeats"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="ListInhibitors"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="Inhibit"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="SetUserLinger"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="ActivateSession"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="ActivateSessionOnSeat"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="PowerOff"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="Reboot"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="Suspend"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="Hibernate"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="HybridSleep"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="CanPowerOff"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="CanReboot"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="CanSuspend"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="CanHibernate"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="CanHybridSleep"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="AttachDevice"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Manager"
+                       send_member="FlushDevices"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Seat"
+                       send_member="ActivateSession"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Seat"
+                       send_member="SwitchTo"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Seat"
+                       send_member="SwitchToPrevious"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Seat"
+                       send_member="SwitchToNext"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Session"
+                       send_member="Activate"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Session"
+                       send_member="SetIdleHint"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Session"
+                       send_member="TakeControl"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Session"
+                       send_member="ReleaseControl"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Session"
+                       send_member="TakeDevice"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Session"
+                       send_member="ReleaseDevice"/>
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Session"
+                       send_member="PauseDeviceComplete"/>
+                <allow receive_sender="org.freedesktop.login1"/>
+        </policy>
+</busconfig>
diff --git a/conf/sysbus-policy/timedated-dbus.conf b/conf/sysbus-policy/timedated-dbus.conf
new file mode 100644
index 0000000..38d4109
--- /dev/null
+++ b/conf/sysbus-policy/timedated-dbus.conf
@@ -0,0 +1,14 @@
+<?xml version="1.0"?> 
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+        <policy user="root">
+                <allow own="org.freedesktop.timedate1"/>
+                <allow send_destination="org.freedesktop.timedate1"/>
+                <allow receive_sender="org.freedesktop.timedate1"/>
+        </policy>
+        <policy context="default">
+                <allow send_destination="org.freedesktop.timedate1"/>
+                <allow receive_sender="org.freedesktop.timedate1"/>
+        </policy>
+</busconfig>
diff --git a/conf/timedated-dbus.conf b/conf/timedated-dbus.conf
deleted file mode 100644
index 38d4109..0000000
--- a/conf/timedated-dbus.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?> 
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-        <policy user="root">
-                <allow own="org.freedesktop.timedate1"/>
-                <allow send_destination="org.freedesktop.timedate1"/>
-                <allow receive_sender="org.freedesktop.timedate1"/>
-        </policy>
-        <policy context="default">
-                <allow send_destination="org.freedesktop.timedate1"/>
-                <allow receive_sender="org.freedesktop.timedate1"/>
-        </policy>
-</busconfig>
diff --git a/conf/timedated-ispect.xml b/conf/timedated-ispect.xml
deleted file mode 100644
index 5dc44ff..0000000
--- a/conf/timedated-ispect.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-    <interface name="org.freedesktop.timedate1">
-        <property name="Timezone" type="s" access="read" />
-        <property name="LocalRTC" type="b" access="read" />
-        <property name="CanNTP" type="b" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
-        </property>
-        <property name="NTP" type="b" access="read" />
-        <property name="NTPSynchronized" type="b" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
-        </property>
-        <property name="TimeUSec" type="t" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
-        </property>
-        <property name="RTCTimeUSec" type="t" access="read">
-            <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="false" />
-        </property>
-        <method name="SetTime">
-            <arg type="x" direction="in" />
-            <arg type="b" direction="in" />
-            <arg type="b" direction="in" />
-        </method>
-        <method name="SetTimezone">
-            <arg type="s" direction="in" />
-            <arg type="b" direction="in" />
-        </method>
-        <method name="SetLocalRTC">
-            <arg type="b" direction="in" />
-            <arg type="b" direction="in" />
-            <arg type="b" direction="in" />
-        </method>
-        <method name="SetNTP">
-            <arg type="b" direction="in" />
-            <arg type="b" direction="in" />
-        </method>
-    </interface>
-</node>
-- 
cgit v1.2.3