Add a dbus config for system-server

Change-Id: I35a6bcf750d00232603921da8b400a25f1c4ae51

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91c6fe0..26b8bf1 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,6 +73,7 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
 INSTALL(FILES ${MOVINAND_FORMAT} DESTINATION bin)
 INSTALL(FILES ${UDEV_RULES} DESTINATION ${UDEV_RULES_PATH})
 INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/system_server.sh DESTINATION /etc/rc.d/init.d)
+INSTALL(FILES system-server.conf DESTINATION /etc/dbus-1/system.d)
 
 ADD_SUBDIRECTORY(restarter)
 ADD_SUBDIRECTORY(sys_event)

diff --git a/packaging/system-server.spec b/packaging/system-server.spec
index a3c4770..0ccad3f 100755 (executable)
--- a/packaging/system-server.spec
+++ b/packaging/system-server.spec
@@ -1,7 +1,7 @@
 #sbs-git:slp/pkgs/s/system-server system-server 0.1.51 56e16bca39f96d6c8aed9ed3df2fea9b393801be
 Name:       system-server
 Summary:    System server
-Version: 0.1.57
+Version: 0.1.58
 Release:    1
 Group:      TO_BE/FILLED_IN
 License:    Flora Software License
@@ -34,7 +34,6 @@ Requires(postun): /usr/bin/systemctl
 %description
 Description: System server
 
-
 %prep
 %setup -q
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
@@ -118,6 +117,10 @@ systemctl daemon-reload
 
 %files
 %manifest system-server.manifest
+%config %{_sysconfdir}/dbus-1/system.d/system-server.conf
+%{_sysconfdir}/rc.d/init.d/system_server.sh
+%{_sysconfdir}/rc.d/rc3.d/S35system-server
+%{_sysconfdir}/rc.d/rc5.d/S00system-server
 %{_bindir}/system_server
 %{_bindir}/restart
 %{_bindir}/movi_format.sh
@@ -130,6 +133,3 @@ systemctl daemon-reload
 %{_datadir}/system-server/udev-rules/91-system-server.rules
 %{_datadir}/system-server/sys_device_noti/res/locale/*/LC_MESSAGES/*.mo
 %{_datadir}/system-server/sys_pci_noti/res/locale/*/LC_MESSAGES/*.mo
-%{_sysconfdir}/rc.d/init.d/system_server.sh
-%{_sysconfdir}/rc.d/rc3.d/S35system-server
-%{_sysconfdir}/rc.d/rc5.d/S00system-server

diff --git a/system-server.conf b/system-server.conf
new file mode 100644 (file)
index 0000000..21a6638
--- /dev/null
+++ b/system-server.conf
@@ -0,0 +1,10 @@
+<!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="slp.system.server"/>
+    </policy>
+    <policy context="default">
+        <deny own="slp.system.server"/>
+    </policy>
+</busconfig>