From 8ccd82e04c28ca49b70a619e3d6e81d67e68ab95 Mon Sep 17 00:00:00 2001
From: "greg@kroah.com" <greg@kroah.com>
Date: Wed, 31 Dec 2003 20:38:14 -0800
Subject: [PATCH] move the dbus config file to etc/dbus-1/system.d/

---
 Makefile                                    |  3 ++-
 etc/dbus-1/system.d/udev_sysbus_policy.conf | 23 +++++++++++++++++++++++
 udev_sysbus_policy.conf                     | 23 -----------------------
 3 files changed, 25 insertions(+), 24 deletions(-)
 create mode 100644 etc/dbus-1/system.d/udev_sysbus_policy.conf
 delete mode 100644 udev_sysbus_policy.conf

diff --git a/Makefile b/Makefile
index b27f1b92d9..dae0d9a1f9 100644
--- a/Makefile
+++ b/Makefile
@@ -266,7 +266,8 @@ small_release: $(DISTFILES) clean
 ifeq ($(USE_DBUS), true)
 install-dbus-policy:
 	$(INSTALL) -d $(DESTDIR)$(dbusdir)
-	$(INSTALL_DATA) udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
+	$(INSTALL_DATA) etc/dbus-1/system.d/udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
+
 uninstall-dbus-policy:
 	- rm $(DESTDIR)$(dbusdir)/udev_sysbus_policy.conf
 else
diff --git a/etc/dbus-1/system.d/udev_sysbus_policy.conf b/etc/dbus-1/system.d/udev_sysbus_policy.conf
new file mode 100644
index 0000000000..b2660e65cf
--- /dev/null
+++ b/etc/dbus-1/system.d/udev_sysbus_policy.conf
@@ -0,0 +1,23 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <!-- This configuration file specifies the required security policies
+       for udev to work. -->
+
+  <!-- Only root can own the udev service and only root can use the
+       org.kernel.udev.NodeMonitor interface to send signals -->
+  <policy user="root">
+    <allow own="org.kernel.udev"/>
+
+    <allow send_interface="org.kernel.udev.NodeMonitor"/>
+  </policy>
+
+  <!-- Allow anyone to listen to the org.kernel.udev.NodeMonitor interface 
+       for messages send from the owner of the org.kernel.udev service -->
+  <policy context="default">
+    <allow receive_interface="org.kernel.udev.NodeMonitor"/>
+  </policy>
+</busconfig>
+
diff --git a/udev_sysbus_policy.conf b/udev_sysbus_policy.conf
deleted file mode 100644
index b2660e65cf..0000000000
--- a/udev_sysbus_policy.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <!-- This configuration file specifies the required security policies
-       for udev to work. -->
-
-  <!-- Only root can own the udev service and only root can use the
-       org.kernel.udev.NodeMonitor interface to send signals -->
-  <policy user="root">
-    <allow own="org.kernel.udev"/>
-
-    <allow send_interface="org.kernel.udev.NodeMonitor"/>
-  </policy>
-
-  <!-- Allow anyone to listen to the org.kernel.udev.NodeMonitor interface 
-       for messages send from the owner of the org.kernel.udev service -->
-  <policy context="default">
-    <allow receive_interface="org.kernel.udev.NodeMonitor"/>
-  </policy>
-</busconfig>
-
-- 
cgit v1.2.3-54-g00ecf