From 817e224bbce3ed157817961ef19c80a250845a05 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Thu, 29 May 2014 21:51:50 +0200 Subject: 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)" --- src/core/socket.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'src/core/socket.c') 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); -- cgit v1.2.3-54-g00ecf