summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-01-04 21:18:17 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-01-04 21:57:55 -0500
commita83ad683fd13e27b3c4e582ecd6c3852245dbe2f (patch)
tree98ddde0df921ad71b5be6752a3e68553f64b03c3
parent0250d95659147bae10053a69bab88dc310c4ea39 (diff)
downloadsystemd-a83ad683fd13e27b3c4e582ecd6c3852245dbe2f.tar.gz
systemd-a83ad683fd13e27b3c4e582ecd6c3852245dbe2f.tar.bz2
systemd-a83ad683fd13e27b3c4e582ecd6c3852245dbe2f.zip
service: fixup after ifdef dropping
Commit 88516c0 removed one line too much.
-rw-r--r--src/core/service.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/service.c b/src/core/service.c
index a4e419b795..70b93e8446 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -977,9 +977,9 @@ static int service_load_sysv_name(Service *s, const char *name) {
/* For SysV services we strip the rc.* and *.sh
* prefixes/suffixes. */
- if (endswith(name, ".sh.service"))
+ if (startswith(name, "rc.") ||
+ endswith(name, ".sh.service"))
return -ENOENT;
- if (startswith(name, "rc."))
STRV_FOREACH(p, UNIT(s)->manager->lookup_paths.sysvinit_path) {
char *path;