Patchwork [meta-systemd,2/2] busybox: stopping systemd-kmsg-syslogd is not needed

login
register
mail settings
Submitter Khem Raj
Date July 28, 2012, 10:51 p.m.
Message ID <1343515918-20671-2-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/33261/
State Accepted
Commit b0032dca6939259409f9ea3c925c3af2f757c0b0
Headers show

Comments

Khem Raj - July 28, 2012, 10:51 p.m.
systemd-kmsg-syslogd.service is discontinued in systemd so
there is no need to stop it.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../busybox/busybox/busybox-syslog.service.in      |    1 -
 .../recipes-core/busybox/busybox_1.19.4.bbappend   |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)
Otavio Salvador - July 29, 2012, 1:10 p.m.
On Sat, Jul 28, 2012 at 7:51 PM, Khem Raj <raj.khem@gmail.com> wrote:
> systemd-kmsg-syslogd.service is discontinued in systemd so
> there is no need to stop it.

I don't see a relationship in above description :-)

Or we drop it completely or it needs to be stoped ;-)
Martin Jansa - July 29, 2012, 1:13 p.m.
On Sun, Jul 29, 2012 at 10:10:48AM -0300, Otavio Salvador wrote:
> On Sat, Jul 28, 2012 at 7:51 PM, Khem Raj <raj.khem@gmail.com> wrote:
> > systemd-kmsg-syslogd.service is discontinued in systemd so
> > there is no need to stop it.
> 
> I don't see a relationship in above description :-)
> 
> Or we drop it completely or it needs to be stoped ;-)

It's not installed by current systemd, so busybox-syslogd-systemd is
failing (to start/stop) because it's trying to stop it.

Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
Otavio Salvador - July 29, 2012, 1:16 p.m.
On Sun, Jul 29, 2012 at 10:13 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Sun, Jul 29, 2012 at 10:10:48AM -0300, Otavio Salvador wrote:
>> On Sat, Jul 28, 2012 at 7:51 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> > systemd-kmsg-syslogd.service is discontinued in systemd so
>> > there is no need to stop it.
>>
>> I don't see a relationship in above description :-)
>>
>> Or we drop it completely or it needs to be stoped ;-)
>
> It's not installed by current systemd, so busybox-syslogd-systemd is
> failing (to start/stop) because it's trying to stop it.

Then the .systemd file needs to be removed, not the stop to be dropped.
Martin Jansa - July 29, 2012, 1:35 p.m.
On Sun, Jul 29, 2012 at 10:16:06AM -0300, Otavio Salvador wrote:
> On Sun, Jul 29, 2012 at 10:13 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > On Sun, Jul 29, 2012 at 10:10:48AM -0300, Otavio Salvador wrote:
> >> On Sat, Jul 28, 2012 at 7:51 PM, Khem Raj <raj.khem@gmail.com> wrote:
> >> > systemd-kmsg-syslogd.service is discontinued in systemd so
> >> > there is no need to stop it.
> >>
> >> I don't see a relationship in above description :-)
> >>
> >> Or we drop it completely or it needs to be stoped ;-)
> >
> > It's not installed by current systemd, so busybox-syslogd-systemd is
> > failing (to start/stop) because it's trying to stop it.
> 
> Then the .systemd file needs to be removed, not the stop to be dropped.

what's .systemd file?

systemd-kmsg-syslogd.service *was* already removed in current systemd version
we have in meta-systemd.

busybox-syslog.service.in can still be usefull for someone and it should
work if 
ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
line is removed like khem did.

Cheers,

Patch

diff --git a/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in b/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
index 27b9831..c6c625e 100644
--- a/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
+++ b/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
@@ -3,7 +3,6 @@  Description=System Logging Service
 Wants=busybox-klogd.service
 
 [Service]
-ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
 EnvironmentFile=-/etc/default/busybox-syslog
 ExecStart=@base_sbindir@/syslogd -n $OPTIONS
 Sockets=syslog.socket
diff --git a/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend b/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
index a0ae2ce..915a50e 100644
--- a/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
+++ b/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
@@ -1,6 +1,6 @@ 
 inherit systemd
 
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
 
 # look for files in the layer first
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"