diff options
| -rw-r--r-- | configs/android2_defconfig | 1 | ||||
| -rw-r--r-- | configs/android_defconfig | 1 | ||||
| -rw-r--r-- | configs/android_ndk_defconfig | 1 | ||||
| -rw-r--r-- | configs/cygwin_defconfig | 1 | ||||
| -rw-r--r-- | include/libbb.h | 5 | ||||
| -rw-r--r-- | libbb/systemd_support.c | 62 | ||||
| -rw-r--r-- | sysklogd/syslogd.c | 5 |
7 files changed, 0 insertions, 76 deletions
diff --git a/configs/android2_defconfig b/configs/android2_defconfig index 4dfbdb526..1095094fe 100644 --- a/configs/android2_defconfig +++ b/configs/android2_defconfig @@ -89,7 +89,6 @@ CONFIG_PREFIX="./_install" # # Busybox Library Tuning # -# CONFIG_FEATURE_SYSTEMD is not set # CONFIG_FEATURE_RTMINMAX is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 diff --git a/configs/android_defconfig b/configs/android_defconfig index e35830e7f..082994b6c 100644 --- a/configs/android_defconfig +++ b/configs/android_defconfig @@ -107,7 +107,6 @@ CONFIG_PREFIX="./_install" # # Busybox Library Tuning # -# CONFIG_FEATURE_SYSTEMD is not set # CONFIG_FEATURE_RTMINMAX is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 diff --git a/configs/android_ndk_defconfig b/configs/android_ndk_defconfig index 66c85268f..63fafb468 100644 --- a/configs/android_ndk_defconfig +++ b/configs/android_ndk_defconfig @@ -96,7 +96,6 @@ CONFIG_PREFIX="./_install" # # Busybox Library Tuning # -# CONFIG_FEATURE_SYSTEMD is not set # CONFIG_FEATURE_RTMINMAX is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 diff --git a/configs/cygwin_defconfig b/configs/cygwin_defconfig index aa346e34c..2c02be743 100644 --- a/configs/cygwin_defconfig +++ b/configs/cygwin_defconfig @@ -89,7 +89,6 @@ CONFIG_PREFIX="./_install" # # Busybox Library Tuning # -# CONFIG_FEATURE_SYSTEMD is not set CONFIG_FEATURE_RTMINMAX=y CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 diff --git a/include/libbb.h b/include/libbb.h index 1a3f6d8ce..28f57223d 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -1333,11 +1333,6 @@ extern void selinux_preserve_fcontext(int fdesc) FAST_FUNC; extern void selinux_or_die(void) FAST_FUNC; -/* systemd support */ -#define SD_LISTEN_FDS_START 3 -int sd_listen_fds(void); - - /* setup_environment: * if chdir pw->pw_dir: ok: else if to_tmp == 1: goto /tmp else: goto / or die * if clear_env = 1: cd(pw->pw_dir), clear environment, then set diff --git a/libbb/systemd_support.c b/libbb/systemd_support.c deleted file mode 100644 index 542a3efff..000000000 --- a/libbb/systemd_support.c +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) 2011 Davide Cavalca <davide@geexbox.org> - * - * Based on http://cgit.freedesktop.org/systemd/tree/src/sd-daemon.c - * Copyright 2010 Lennart Poettering - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation files - * (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, - * publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#include "libbb.h" - -//config:config FEATURE_SYSTEMD -//config: bool "Enable systemd support" -//config: default y -//config: help -//config: If you plan to use busybox daemons on a system where daemons -//config: are controlled by systemd, enable this option. -//config: If you don't use systemd, it is still safe to enable it, -//config: but the downside is increased code size. - -//kbuild:lib-$(CONFIG_FEATURE_SYSTEMD) += systemd_support.o - -int sd_listen_fds(void) -{ - const char *e; - int n; - int fd; - - e = getenv("LISTEN_PID"); - if (!e) - return 0; - n = xatoi_positive(e); - /* Is this for us? */ - if (getpid() != (pid_t) n) - return 0; - - e = getenv("LISTEN_FDS"); - if (!e) - return 0; - n = xatoi_positive(e); - for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd++) - close_on_exec_on(fd); - - return n; -} diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index 288b29cf7..0ea557a6c 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c @@ -936,11 +936,6 @@ static NOINLINE int create_socket(void) int sock_fd; char *dev_log_name; -#if ENABLE_FEATURE_SYSTEMD - if (sd_listen_fds() == 1) - return SD_LISTEN_FDS_START; -#endif - memset(&sunx, 0, sizeof(sunx)); sunx.sun_family = AF_UNIX; |