From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 28 Jul 2011 21:42:47 +0000 (+0200)
Subject: main: redirection to telinit is unnecessary if sysv compat is disabled
X-Git-Tag: v32~7
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=058dc6f3793af16feae92fa5ddf2a5c58ad5c905;p=systemd

main: redirection to telinit is unnecessary if sysv compat is disabled
---

diff --git a/src/main.c b/src/main.c
index 25b6e87d..f8682d24 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1021,6 +1021,7 @@ int main(int argc, char *argv[]) {
         dual_timestamp initrd_timestamp = { 0ULL, 0ULL };
         char systemd[] = "systemd";
 
+#ifdef HAVE_SYSV_COMPAT
         if (getpid() != 1 && strstr(program_invocation_short_name, "init")) {
                 /* This is compatibility support for SysV, where
                  * calling init as a user is identical to telinit. */
@@ -1030,6 +1031,7 @@ int main(int argc, char *argv[]) {
                 log_error("Failed to exec " SYSTEMCTL_BINARY_PATH ": %m");
                 return 1;
         }
+#endif
 
         /* If we get started via the /sbin/init symlink then we are
            called 'init'. After a subsequent reexecution we are then