chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9d76d73
)
main: redirection to telinit is unnecessary if sysv compat is disabled
author
Lennart Poettering
<lennart@poettering.net>
Thu, 28 Jul 2011 21:42:47 +0000
(23:42 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 28 Jul 2011 21:42:47 +0000
(23:42 +0200)
src/main.c
patch
|
blob
|
history
diff --git
a/src/main.c
b/src/main.c
index 25b6e87de395a53257ee50cf37c7c6b4ca0bb5ca..f8682d2456b9cb894f4e028a68b7174022ebeee8 100644
(file)
--- 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";
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. */
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;
}
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
/* If we get started via the /sbin/init symlink then we are
called 'init'. After a subsequent reexecution we are then