From 85211309f0e14d7f804e1367e838291f39f6cec0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 8 Mar 2011 18:41:23 +0100 Subject: [PATCH] service: prefix description with LSB only if script has LSB header, use 'SysV:' otherwise --- TODO | 6 ++---- src/service.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/TODO b/TODO index cad97746e..63a5faafc 100644 --- a/TODO +++ b/TODO @@ -16,9 +16,9 @@ F15: * mount /dev/.run and /var/run as bind mounts -* Make use of UnknownInterface, UnknownObject +* Make use of UnknownInterface -* verify SYSTEMD_IGNORE_DEPENDENCIES support in /etc/rc.d/functions +* support chkconfig without forwarding to systemctl to facilitate upgrades Features: @@ -26,8 +26,6 @@ Features: * consider services with any kind of link in /etc/systemd/system enabled -* introduce "x-systemd-automount" as alternative to the "comment=systemd.automount" mount option - * show failure error string in "systemctl status" * make sure timeouts are applied to Type=oneshot services. diff --git a/src/service.c b/src/service.c index 017b546d8..465e1a7a5 100644 --- a/src/service.c +++ b/src/service.c @@ -835,7 +835,7 @@ static int service_load_sysv_path(Service *s, const char *path) { if (description) { char *d; - if (!(d = strappend("LSB: ", description))) { + if (!(d = strappend(s->sysv_has_lsb ? "LSB: " : "SysV: ", description))) { r = -ENOMEM; goto finish; } -- 2.30.2