Revert "logger: detect proper apps/events buffer path"

This reverts commit f4fe42b5dc8dcff4572353675c1bc52a62d7d939.

The post-install script works correctly as long as the package
is installed on the target directly. However, it won't work if
it arrives on the target by being included in an image, due to
the post-install script having been ran on a different system,
the one where the image had been built and not the target one.

There isn't a strict regression because the end result is that
the image sometimes contains the other path (which means there
are still some devices that will work and some that won't), so
there might still be value to keeping the change as a reminder
of the underlying problem of Android log device availablility.

Change-Id: Id71b5a66d3115fdac876ad06c51aed607a31b452
Signed-off-by: Michal Bloch <m.bloch@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index 781f0f8..6d6b815 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -211,8 +211,6 @@ dlogconfdir = $(sysconfdir)/dlog.conf.d
 dlogconf_DATA = \
        configs/20-pipe.conf \
        configs/25-logger.conf \
-       configs/26-logger-apps.conf.inactive \
-       configs/26-logger-events.conf.inactive \
        configs/99-dlog-logger.disable-platform-logging-for-testsuite.conf
 
 bin_SCRIPTS = dlog_test

diff --git a/configs/25-logger.conf b/configs/25-logger.conf
index 1de8b75..a0dd3ac 100644 (file)
--- a/configs/25-logger.conf
+++ b/configs/25-logger.conf
@@ -1,6 +1,7 @@
 backend=logger
 
 main=/dev/log_main
+apps=/dev/log_apps
 system=/dev/log_system
 radio=/dev/log_radio
 

diff --git a/configs/26-logger-apps.conf.inactive b/configs/26-logger-apps.conf.inactive
deleted file mode 100644 (file)
index 320e9dd..0000000
--- a/configs/26-logger-apps.conf.inactive
+++ /dev/null
@@ -1 +0,0 @@
-apps=/dev/log_apps

diff --git a/configs/26-logger-events.conf.inactive b/configs/26-logger-events.conf.inactive
deleted file mode 100644 (file)
index a09a6be..0000000
--- a/configs/26-logger-events.conf.inactive
+++ /dev/null
@@ -1 +0,0 @@
-apps=/dev/log_events

diff --git a/packaging/dlog.spec b/packaging/dlog.spec
index f219935..ce53c72 100644 (file)
--- a/packaging/dlog.spec
+++ b/packaging/dlog.spec
@@ -200,22 +200,6 @@ fi
 %manifest dlog.manifest
 %license LICENSE.APACHE2.0
 %{_sysconfdir}/dlog.conf.d/25-logger.conf
-%{_sysconfdir}/dlog.conf.d/26-logger-apps.conf.inactive
-%{_sysconfdir}/dlog.conf.d/26-logger-events.conf.inactive
-
-%post -n dlogbackend-logger
-# detect the apps/events device file path and create proper symlink - depending
-# on kernel version the path may differ on various targets
-[ -h %{_sysconfdir}/dlog.conf.d/26-logger.conf ] && rm %{_sysconfdir}/dlog.conf.d/26-logger.conf
-
-if [ -c /dev/log_events ]; then
-       ln -s 26-logger-events.conf.inactive %{_sysconfdir}/dlog.conf.d/26-logger.conf
-else
-       ln -s 26-logger-apps.conf.inactive %{_sysconfdir}/dlog.conf.d/26-logger.conf
-fi
-
-%postun -n dlogbackend-logger
-[ -h %{_sysconfdir}/dlog.conf.d/26-logger.conf ] && rm %{_sysconfdir}/dlog.conf.d/26-logger.conf
 
 %files -n log-syslog
 %manifest dlog.manifest

diff --git a/src/shared/logconfig.c b/src/shared/logconfig.c
index 51baa62..86d9e03 100644 (file)
--- a/src/shared/logconfig.c
+++ b/src/shared/logconfig.c
@@ -206,7 +206,7 @@ static int config_entry_filter(const struct dirent *de)
 {
        assert(de);
 
-       if (de->d_type != DT_REG && de->d_type != DT_LNK)
+       if (de->d_type != DT_REG)
                return 0;
 
        if (!str_ends_with(de->d_name, DEFAULT_CONFIG_SUFFIX))