- drop systemd stuff, TLD will not be adopting this bloatware

[rc-scripts.git] / lib / functions

diff --git a/lib/functions b/lib/functions
index 04e7f29332e7ee316b75de17381e6c655fb4fea5..41871391e435759b513ffd5e96343c4a0d7bc018 100644 (file)
--- a/lib/functions
+++ b/lib/functions
@@ -5,11 +5,13 @@
 #
 # Author:      Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
 # Hacked by:   Greg Galloway and Marc Ewing
-# Modified for TLD Linux by:
+# Modified for PLD Linux by:
 #              Marek Obuchowicz <elephant@pld-linux.org>
 #              Arkadiusz Miśkiewicz <misiek@pld-linux.org>
 #              Michał Kochanowicz <mkochano@pld-linux.org>
 #              Łukasz Pawelczyk <havner@pld-linux.org>
+# Modified for TLD Linux by:
+#              Marcin Krol <hawk@tld-linux.org>
 
 # First set up a default search path.
 export PATH="/sbin:/usr/sbin:/bin:/usr/bin"
@@ -164,21 +166,7 @@ strstr() {
 
 # Apply sysctl settings, including files in /etc/sysctl.d
 apply_sysctl() {
-       if [ -x /lib/systemd/systemd-sysctl ]; then
-               /lib/systemd/systemd-sysctl
-               return
-       fi
-
        local file
-       for file in /usr/lib/sysctl.d/*.conf; do
-               [ -f /run/sysctl.d/${file##*/} ] && continue
-               [ -f /etc/sysctl.d/${file##*/} ] && continue
-               test -f "$file" && sysctl -q -e -p "$file"
-       done
-       for file in /run/sysctl.d/*.conf; do
-               [ -f /etc/sysctl.d/${file##*/} ] && continue
-               test -f "$file" && sysctl -q -e -p "$file"
-       done
        for file in /etc/sysctl.d/*.conf; do
                test -f "$file" && sysctl -q -e -p "$file"
        done
@@ -577,7 +565,7 @@ run_cmd() {
                cd /
                export HOME=/tmp TMPDIR=/tmp
                if is_no "$RC_LOGGING"; then
-                       ${user:+setuidgid -s $user} "$@" 2>&1
+                       ${user:+setuidgid -s $user} eval "$@" 2>&1
                else
                        ${user:+setuidgid -s $user} initlog -c "$*" 2>&1
                fi
@@ -1321,35 +1309,6 @@ rc_gettext_init() {
        fi
 }
 
-use_upstart () {
-       return 1
-}
-emit () {
-       return 0
-}
-is_upstart_task() {
-       return 1
-}
-is_upstart_running() {
-       return 1
-}
-upstart_start() {
-       return 1
-}
-upstart_stop() {
-       return 1
-}
-upstart_reload() {
-       return 0
-}
-upstart_status() {
-       return 1
-}
-_upstart_controlled() {
-       return 0
-}
-alias upstart_controlled='_upstart_controlled $0 "$@"'
-
 rc_gettext_init
 rc_cache_init