summaryrefslogtreecommitdiff
path: root/src/core/socket.c
diff options
context:
space:
mode:
authorThomas Hindoe Paaboel Andersen <phomes@gmail.com>2014-05-29 21:51:50 +0200
committerThomas Hindoe Paaboel Andersen <phomes@gmail.com>2014-06-07 00:59:38 +0200
commit817e224bbce3ed157817961ef19c80a250845a05 (patch)
treef0b3067010f0ce6757a2bd397db46976dc8d8569 /src/core/socket.c
parent95ed3294c632f5606327149f10cef1eb34422862 (diff)
Remove sysv parser from service.c
Parsing sysv files was moved to the sysv-generator in the previous commit. This patch removes the sysv parsing from serivce.c. Note that this patch drops the following now unused sysv-specific info from service dump: "SysV Init Script has LSB Header: (yes/no)" "SysVEnabled: (yes/no)" "SysVRunLevels: (levels)"
Diffstat (limited to 'src/core/socket.c')
-rw-r--r--src/core/socket.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/core/socket.c b/src/core/socket.c
index 4fb4b991e2..94eb2e7a5d 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -209,13 +209,6 @@ static int socket_instantiate_service(Socket *s) {
if (r < 0)
return r;
-#ifdef HAVE_SYSV_COMPAT
- if (SERVICE(u)->is_sysv) {
- log_error("Using SysV services for socket activation is not supported. Refusing.");
- return -ENOENT;
- }
-#endif
-
u->no_gc = true;
unit_ref_set(&s->service, u);
@@ -1870,13 +1863,6 @@ static int socket_start(Unit *u) {
log_error_unit(u->id, "Socket service %s already active, refusing.", UNIT(service)->id);
return -EBUSY;
}
-
-#ifdef HAVE_SYSV_COMPAT
- if (service->is_sysv) {
- log_error_unit(u->id, "Using SysV services for socket activation is not supported. Refusing.");
- return -ENOENT;
- }
-#endif
}
assert(s->state == SOCKET_DEAD || s->state == SOCKET_FAILED);