packaging: logger: Ensure logger device node permissions are applied before dlog_logg...

This is workaround for dlog_logger being started before udev applies
its rules (which includes device node permissions, which dlog tries
to access).

Change-Id: Idd942e83bad03bd1eeefc8e5aa4a790f3d9c67dd

diff --git a/packaging/01-dlog.rules b/packaging/01-dlog.rules
index c643690..4185d50 100644 (file)
--- a/packaging/01-dlog.rules
+++ b/packaging/01-dlog.rules
@@ -1,4 +1 @@
-KERNEL=="log_system", MODE="0662", OWNER="log", GROUP="log", SECLABEL{smack}="*"
-KERNEL=="log_radio", MODE="0662", OWNER="log", GROUP="log", SECLABEL{smack}="*"
-KERNEL=="log_main", MODE="0662", OWNER="log", GROUP="log", SECLABEL{smack}="*"
-KERNEL=="log_events", MODE="0662", OWNER="log", GROUP="log", SECLABEL{smack}="*"
+ACTION=="add", KERNEL=="log_system|log_radio|log_main|log_events|log_apps", MODE="0662", OWNER="log", GROUP="log", SECLABEL{smack}="*", TAG+="systemd", ENV{SYSTEMD_WANTS}="dlog_logger.service"

diff --git a/packaging/dlog.spec b/packaging/dlog.spec
index 51b5cb2..e64f244 100644 (file)
--- a/packaging/dlog.spec
+++ b/packaging/dlog.spec
@@ -7,6 +7,7 @@ License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source101:  packaging/dlog.manifest
 Source501:  packaging/01-dlog.rules
+Source502:  packaging/logger-devices.conf
 
 %define upgrade_file_path %{_datadir}/upgrade
 # NOTE: sysconfdir will be passed to ./configure automatically
@@ -124,6 +125,9 @@ ln -s ../dlog_dev-log.socket %{buildroot}/%{_unitdir}/sockets.target.wants/dlog_
 mkdir -p %{buildroot}/%{_udevrulesdir}
 install -m 0644 %SOURCE501 %{buildroot}/%{_udevrulesdir}/01-dlog.rules
 
+mkdir -p %{buildroot}%{_unitdir}/dlog_logger.service.d
+install -m 0644 %SOURCE502 %{buildroot}%{_unitdir}/dlog_logger.service.d/logger-devices.conf
+
 mkdir -p %{buildroot}/var/log/dlog
 
 mkdir -p %{buildroot}/var/lib/dlog-tests
@@ -200,6 +204,7 @@ fi
 %manifest dlog.manifest
 %license LICENSE.APACHE2.0
 %{_sysconfdir}/dlog.conf.d/25-logger.conf
+%{_unitdir}/dlog_logger.service.d/logger-devices.conf
 
 %files -n log-syslog
 %manifest dlog.manifest

diff --git a/packaging/logger-devices.conf b/packaging/logger-devices.conf
new file mode 100644 (file)
index 0000000..40da4cd
--- /dev/null
+++ b/packaging/logger-devices.conf
@@ -0,0 +1,3 @@
+[Unit]
+Requires=dev-log_main.device dev-log_system.device dev-log_radio.device
+After=dev-log_main.device dev-log_system.device dev-log_radio.device dev-log_events.device dev-log_apps.device
\ No newline at end of file