aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configs/android2_defconfig1
-rw-r--r--configs/android_defconfig1
-rw-r--r--configs/android_ndk_defconfig1
-rw-r--r--configs/cygwin_defconfig1
-rw-r--r--include/libbb.h5
-rw-r--r--libbb/systemd_support.c62
-rw-r--r--sysklogd/syslogd.c5
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"
89# 89#
90# Busybox Library Tuning 90# Busybox Library Tuning
91# 91#
92# CONFIG_FEATURE_SYSTEMD is not set
93# CONFIG_FEATURE_RTMINMAX is not set 92# CONFIG_FEATURE_RTMINMAX is not set
94CONFIG_PASSWORD_MINLEN=6 93CONFIG_PASSWORD_MINLEN=6
95CONFIG_MD5_SMALL=1 94CONFIG_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"
107# 107#
108# Busybox Library Tuning 108# Busybox Library Tuning
109# 109#
110# CONFIG_FEATURE_SYSTEMD is not set
111# CONFIG_FEATURE_RTMINMAX is not set 110# CONFIG_FEATURE_RTMINMAX is not set
112CONFIG_PASSWORD_MINLEN=6 111CONFIG_PASSWORD_MINLEN=6
113CONFIG_MD5_SMALL=1 112CONFIG_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"
96# 96#
97# Busybox Library Tuning 97# Busybox Library Tuning
98# 98#
99# CONFIG_FEATURE_SYSTEMD is not set
100# CONFIG_FEATURE_RTMINMAX is not set 99# CONFIG_FEATURE_RTMINMAX is not set
101CONFIG_PASSWORD_MINLEN=6 100CONFIG_PASSWORD_MINLEN=6
102CONFIG_MD5_SMALL=1 101CONFIG_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"
89# 89#
90# Busybox Library Tuning 90# Busybox Library Tuning
91# 91#
92# CONFIG_FEATURE_SYSTEMD is not set
93CONFIG_FEATURE_RTMINMAX=y 92CONFIG_FEATURE_RTMINMAX=y
94CONFIG_PASSWORD_MINLEN=6 93CONFIG_PASSWORD_MINLEN=6
95CONFIG_MD5_SMALL=1 94CONFIG_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;
1333extern void selinux_or_die(void) FAST_FUNC; 1333extern void selinux_or_die(void) FAST_FUNC;
1334 1334
1335 1335
1336/* systemd support */
1337#define SD_LISTEN_FDS_START 3
1338int sd_listen_fds(void);
1339
1340
1341/* setup_environment: 1336/* setup_environment:
1342 * if chdir pw->pw_dir: ok: else if to_tmp == 1: goto /tmp else: goto / or die 1337 * if chdir pw->pw_dir: ok: else if to_tmp == 1: goto /tmp else: goto / or die
1343 * if clear_env = 1: cd(pw->pw_dir), clear environment, then set 1338 * 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 @@
1/*
2 * Copyright (C) 2011 Davide Cavalca <davide@geexbox.org>
3 *
4 * Based on http://cgit.freedesktop.org/systemd/tree/src/sd-daemon.c
5 * Copyright 2010 Lennart Poettering
6 *
7 * Permission is hereby granted, free of charge, to any person
8 * obtaining a copy of this software and associated documentation files
9 * (the "Software"), to deal in the Software without restriction,
10 * including without limitation the rights to use, copy, modify, merge,
11 * publish, distribute, sublicense, and/or sell copies of the Software,
12 * and to permit persons to whom the Software is furnished to do so,
13 * subject to the following conditions:
14 *
15 * The above copyright notice and this permission notice shall be
16 * included in all copies or substantial portions of the Software.
17 *
18 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
19 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
20 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
21 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
22 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
23 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
24 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
25 * SOFTWARE.
26 */
27#include "libbb.h"
28
29//config:config FEATURE_SYSTEMD
30//config: bool "Enable systemd support"
31//config: default y
32//config: help
33//config: If you plan to use busybox daemons on a system where daemons
34//config: are controlled by systemd, enable this option.
35//config: If you don't use systemd, it is still safe to enable it,
36//config: but the downside is increased code size.
37
38//kbuild:lib-$(CONFIG_FEATURE_SYSTEMD) += systemd_support.o
39
40int sd_listen_fds(void)
41{
42 const char *e;
43 int n;
44 int fd;
45
46 e = getenv("LISTEN_PID");
47 if (!e)
48 return 0;
49 n = xatoi_positive(e);
50 /* Is this for us? */
51 if (getpid() != (pid_t) n)
52 return 0;
53
54 e = getenv("LISTEN_FDS");
55 if (!e)
56 return 0;
57 n = xatoi_positive(e);
58 for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd++)
59 close_on_exec_on(fd);
60
61 return n;
62}
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)
936 int sock_fd; 936 int sock_fd;
937 char *dev_log_name; 937 char *dev_log_name;
938 938
939#if ENABLE_FEATURE_SYSTEMD
940 if (sd_listen_fds() == 1)
941 return SD_LISTEN_FDS_START;
942#endif
943
944 memset(&sunx, 0, sizeof(sunx)); 939 memset(&sunx, 0, sizeof(sunx));
945 sunx.sun_family = AF_UNIX; 940 sunx.sun_family = AF_UNIX;
946 941
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-24 02:15:42 +0000