Apply user and group policy to tizen 3.0

"log" user and group with which dlog_logger.service is run does not have
sufficient rights.

Change-Id: Iaeb55f4dc32f80db3503efef28ab1f43082dbc92

diff --git a/01-dlog.rules b/01-dlog.rules
new file mode 100644 (file)
index 0000000..97896a5
--- /dev/null
+++ b/01-dlog.rules
@@ -0,0 +1,4 @@
+KERNEL=="log_system", MODE="0662", OWNER="log", GROUP="log"
+KERNEL=="log_radio", MODE="0662", OWNER="log", GROUP="log"
+KERNEL=="log_main", MODE="0662", OWNER="log", GROUP="log"
+KERNEL=="log_events", MODE="0662", OWNER="log", GROUP="log"

diff --git a/Makefile.am b/Makefile.am
index a9e3a72..d4ca6fd 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,3 +56,6 @@ dlog_logger_SOURCES = \
 # conf file
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dlog.pc
+
+dlogrulesdir=$(libdir)/udev/rules.d
+dlogrules_DATA = 01-dlog.rules

diff --git a/packaging/dlog.spec b/packaging/dlog.spec
index 20f6a87..b9ade41 100755 (executable)
--- a/packaging/dlog.spec
+++ b/packaging/dlog.spec
@@ -87,6 +87,8 @@ cp %SOURCE201 %{buildroot}/opt/etc/dlog.conf
 # default set log output to external files
 cp %SOURCE202 %{buildroot}/opt/etc/dlog_logger.conf
 
+mkdir -p %{buildroot}/var/log/dlog
+
 %preun -n dlogutil
 
 %post -n dlogutil
@@ -107,21 +109,22 @@ systemctl daemon-reload
 %files  -n dlogutil
 %manifest dlogutil.manifest
 /usr/share/license/dlogutil
-%attr(755,root,app_logging) %{_bindir}/dlog_logger
-%attr(755,root,app_logging) %{_bindir}/dlogutil
-%attr(755,root,app_logging) %{_bindir}/dlogctrl
-%attr(755,root,app_logging) /opt/etc/dlog_logger.conf
+%attr(750,log,log) %{_bindir}/dlog_logger
+%attr(750,log,log) %{_bindir}/dlogutil
+%attr(755,log,log) %{_bindir}/dlogctrl
+%attr(664,log,log) /opt/etc/dlog_logger.conf
 %{_libdir}/systemd/system/dlog_logger.service
 %{_libdir}/systemd/system/dlog_logger.path
 %{_libdir}/systemd/system/multi-user.target.wants/dlog_logger.path
-
+%attr(755,log,log) /var/log/dlog
+%attr(644,root,root) %{_libdir}/udev/rules.d/01-dlog.rules
 
 %files  -n libdlog
 %manifest libdlog.manifest
 /usr/share/license/libdlog
 %{_libdir}/libdlog.so.0
 %{_libdir}/libdlog.so.0.0.0
-%attr(664,root,app_logging) /opt/etc/dlog.conf
+%attr(664,log,log) /opt/etc/dlog.conf
 
 %files -n libdlog-devel
 %{_includedir}/dlog/dlog.h

diff --git a/packaging/dlog_logger.conf-debug.in b/packaging/dlog_logger.conf-debug.in
index 7fbfa33..680f2c8 100755 (executable)
--- a/packaging/dlog_logger.conf-debug.in
+++ b/packaging/dlog_logger.conf-debug.in
@@ -1,3 +1,3 @@
-dlogutil -b system -r 5120 -n 1 -f /var/log/dlog_system -v dump *:I
-dlogutil -b main -r 3072 -n 1 -f /var/log/dlog_main -v dump *:W
-dlogutil -b radio -r 2048 -n 3 -f /var/log/dlog_radio -v dump
+dlogutil -b system -r 5120 -n 1 -f /var/log/dlog/system -v dump *:I
+dlogutil -b main -r 3072 -n 1 -f /var/log/dlog/main -v dump *:W
+dlogutil -b radio -r 2048 -n 3 -f /var/log/dlog/radio -v dump

diff --git a/packaging/dlog_logger.conf-micro.in b/packaging/dlog_logger.conf-micro.in
index d8c301d..1636977 100755 (executable)
--- a/packaging/dlog_logger.conf-micro.in
+++ b/packaging/dlog_logger.conf-micro.in
@@ -1,3 +1,3 @@
-dlogutil -b system -r 5120 -n 1 -f /var/log/dlog_system -v dump *:I
-dlogutil -b main -r 3072 -n 1 -f /var/log/dlog_main -v dump *:W
-dlogutil -b radio -r 1024 -n 1 -f /var/log/dlog_radio -v dump
+dlogutil -b system -r 5120 -n 1 -f /var/log/dlog/system -v dump *:I
+dlogutil -b main -r 3072 -n 1 -f /var/log/dlog/main -v dump *:W
+dlogutil -b radio -r 1024 -n 1 -f /var/log/dlog/radio -v dump

diff --git a/packaging/dlog_logger.conf.in b/packaging/dlog_logger.conf.in
index d8c301d..1636977 100755 (executable)
--- a/packaging/dlog_logger.conf.in
+++ b/packaging/dlog_logger.conf.in
@@ -1,3 +1,3 @@
-dlogutil -b system -r 5120 -n 1 -f /var/log/dlog_system -v dump *:I
-dlogutil -b main -r 3072 -n 1 -f /var/log/dlog_main -v dump *:W
-dlogutil -b radio -r 1024 -n 1 -f /var/log/dlog_radio -v dump
+dlogutil -b system -r 5120 -n 1 -f /var/log/dlog/system -v dump *:I
+dlogutil -b main -r 3072 -n 1 -f /var/log/dlog/main -v dump *:W
+dlogutil -b radio -r 1024 -n 1 -f /var/log/dlog/radio -v dump

diff --git a/packaging/dlog_logger.path b/packaging/dlog_logger.path
index 8557d54..3118371 100644 (file)
--- a/packaging/dlog_logger.path
+++ b/packaging/dlog_logger.path
@@ -2,4 +2,4 @@
 Description=Path activation for dlog_logger
 
 [Path]
-PathExists=/var/log
+PathExists=/var/log/dlog

diff --git a/packaging/dlog_logger.service b/packaging/dlog_logger.service
index 9b165ee..d0d22e2 100755 (executable)
--- a/packaging/dlog_logger.service
+++ b/packaging/dlog_logger.service
@@ -5,7 +5,6 @@ Description=Dumps dlog logs onto disk
 Nice=19
 User=log
 Group=log
-SmackProcessLabel=dlogutil
 ExecStart=/usr/bin/dlog_logger -b 99 -t 600
 Restart=always