service: prefix description with LSB only if script has LSB header, use 'SysV:' otherwise

diff --git a/TODO b/TODO
index cad97746ef4afa559c70df0c90717b25c8efe9fc..63a5faafc0fffda73c310dbfc31a67a65b1708c9 100644 (file)
--- 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 017b546d8cca0dacb6eb527d0fe0ec8095f2cc3b..465e1a7a58ecc4bfb97519eec167c309f4d55ad4 100644 (file)
--- 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;
                 }