Author: Karol Lewandowski <k.lewandowsk@samsung.com>

Date:   Tue Aug 28 09:31:01 2012 +0900

    Use same dlog configuration as found on original SLP images.

    Anything different will confuse developers which is last thing we
    wan't to do right now.

    Additionally, drop DefaultDependencies=no, as when logging to files
    we need rw /var.

diff --git a/packaging/dlog-main.service b/packaging/dlog-main.service
index 6233f2d..c0077f8 100644 (file)
--- a/packaging/dlog-main.service
+++ b/packaging/dlog-main.service
@@ -1,10 +1,8 @@
-
 [Unit]
 Description=Start the dlog service
-DefaultDependencies=no
 
 [Service]
-ExecStart=/usr/bin/dlogutil -v time *:W
+ExecStart=/usr/bin/dlogutil -r 1024 -n 3 -f /var/log/dlog -v time *:W
 
 [Install]
 WantedBy=multi-user.target

diff --git a/packaging/dlog-radio.service b/packaging/dlog-radio.service
index 584760d..28b48fd 100644 (file)
--- a/packaging/dlog-radio.service
+++ b/packaging/dlog-radio.service
@@ -1,10 +1,8 @@
-
 [Unit]
 Description=Start the dlog service
-DefaultDependencies=no
 
 [Service]
-ExecStart=/usr/bin/dlogutil -b radio -v time *:W
+ExecStart=/usr/bin/dlogutil -b radio -v time -f /var/log/seq.radio.log -r 1000 -n 10
 
 [Install]
 WantedBy=multi-user.target

diff --git a/packaging/dlog.spec b/packaging/dlog.spec
old mode 100644 (file)
new mode 100755 (executable)
index 3cf01ca..1010bbf
--- a/packaging/dlog.spec
+++ b/packaging/dlog.spec
@@ -9,7 +9,6 @@ Source0:    %{name}-%{version}.tar.gz
 Source1:    packaging/99-android-logger.rules
 Source101:  packaging/dlog-main.service
 Source102:  packaging/dlog-radio.service
-Source103:  packaging/dlog-system.service
 
 Requires(post): /sbin/ldconfig
 Requires(post): /usr/bin/systemctl
@@ -74,12 +73,10 @@ mkdir -p %{buildroot}%{_libdir}/udev/rules.d
 
 install -m 0644 %SOURCE101 %{buildroot}%{_libdir}/systemd/system/
 install -m 0644 %SOURCE102 %{buildroot}%{_libdir}/systemd/system/
-install -m 0644 %SOURCE103 %{buildroot}%{_libdir}/systemd/system/
 install -m 0644 %SOURCE1 %{buildroot}%{_libdir}/udev/rules.d/
 
 ln -s ../dlog-main.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/dlog-main.service
 ln -s ../dlog-radio.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/dlog-radio.service
-ln -s ../dlog-system.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/dlog-system.service
 
 mkdir -p %{buildroot}/opt/etc/
 cp %{_builddir}/%{name}-%{version}/.debuglevel %{buildroot}/opt/etc/.debuglevel
@@ -89,7 +86,6 @@ cp %{_builddir}/%{name}-%{version}/.debuglevel %{buildroot}/opt/etc/.debuglevel
 if [ $1 == 0 ]; then
     systemctl stop dlog-main.service
     systemctl stop dlog-radio.service
-    systemctl stop dlog-system.service
 fi
 
 %post -n dlogutil
@@ -97,7 +93,6 @@ systemctl daemon-reload
 if [ $1 == 1 ]; then
     systemctl restart dlog-main.service
     systemctl restart dlog-radio.service
-    systemctl restart dlog-system.service
 fi
 
 %postun -n dlogutil
@@ -120,10 +115,8 @@ ln -s /opt/etc/.debuglevel /etc/profile.d/dlevel.sh
 %{_sysconfdir}/rc.d/rc5.d/S05dlog
 %{_libdir}/systemd/system/dlog-main.service
 %{_libdir}/systemd/system/dlog-radio.service
-%{_libdir}/systemd/system/dlog-system.service
 %{_libdir}/systemd/system/multi-user.target.wants/dlog-main.service
 %{_libdir}/systemd/system/multi-user.target.wants/dlog-radio.service
-%{_libdir}/systemd/system/multi-user.target.wants/dlog-system.service
 %{_libdir}/udev/rules.d/99-android-logger.rules
 
 %files  -n libdlog