summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-03-08 18:41:23 +0100
committerLennart Poettering <lennart@poettering.net>2011-03-08 18:41:23 +0100
commit85211309f0e14d7f804e1367e838291f39f6cec0 (patch)
tree44814b131f378615db706dd276e8c2520373dfd6
parent21256a2b3be4f5fb12b68c47e570b865c5a631f8 (diff)
service: prefix description with LSB only if script has LSB header, use 'SysV:' otherwise
-rw-r--r--TODO6
-rw-r--r--src/service.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/TODO b/TODO
index cad97746ef..63a5faafc0 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 017b546d8c..465e1a7a58 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;
}