Ticket #4605: dhcpcd-6.0.5-to-6.2.1_lib_dhcpcd_dhcpcd-run-hooks.diff

lib/dhcpcd/dhcpcd-run-hooks

@@ -18 +18 @@
 signature_base_end="# End of dhcpcd"
 signature_end="$signature_base_end $from $ifname"
 state_dir=/var/run/dhcpcd
+_detected_init=false
 
 : ${if_up:=false}
 : ${if_down:=false}
@@ -193 +194 @@
         return 0
 }
 
+# With the advent of alternative init systems, it's possible to have
+# more than one installed. So we need to try and guess what one we're
+# using unless overriden by configure.
+detect_init()
+{
+        _service_exists=""
+        _service_cmd=""
+        _service_status=""
+
+        [ -n "$_service_cmd" ] && return 0
+
+        if ${_detected_init}; then
+                [ -n "$_service_cmd" ]
+                return $?
+        fi
+
+        # Detect the running init system.
+        # As systemd and OpenRC can be installed on top of legacy init
+        # systems we try to detect them first.
+        _service_status=
+        if [ -x /bin/systemctl -a -S /run/systemd/private ]; then
+                _service_exists="/bin/systemctl --quiet is-enabled \$1.service"
+                _service_status="/bin/systemctl --quiet is-active \$1.service"
+                _service_cmd="/bin/systemctl \$2 \$1.service"
+        elif [ -x /usr/bin/systemctl -a -S /run/systemd/private ]; then
+                _service_exists="/usr/bin/systemctl --quiet is-enabled \$1.service"
+                _service_status="/usr/bin/systemctl --quiet is-active \$1.service"
+                _service_cmd="/usr/bin/systemctl \$2 \$1.service"
+        elif [ -x /sbin/rc-service -a \
+            -s /libexec/rc/init.d/softlevel -o -s /run/openrc/softlevel ]
+        then
+                _service_exists="/sbin/rc-service -e \$1"
+                _service_cmd="/sbin/rc-service \$1 -- -D \$2"
+        elif [ -x /usr/sbin/invoke-rc.d ]; then
+                _service_exists="/usr/sbin/invoke-rc.d --query --quiet \$1 start >/dev/null 2>&1 || [ \$? = 104 ]"
+                _service_cmd="/usr/sbin/invoke-rc.d \$1 \$2"
+        elif [ -x /sbin/service ]; then
+                _service_exists="/sbin/service \$1 >/dev/null 2>&1"
+                _service_cmd="/sbin/service \$1 \$2"
+        elif [ -e /etc/slackware-version -a -d /etc/rc.d ]; then
+                _service_exists="[ -x /etc/rc.d/rc.\$1 ]"
+                _service_cmd="/etc/rc.d/rc.\$1 \$2"
+                _service_status="/etc/rc.d/rc.\$1 status 1>/dev/null 2>&1"
+        else
+                for x in /etc/init.d/rc.d /etc/rc.d /etc/init.d; do
+                        if [ -d $x ]; then
+                                _service_exists="[ -x $x/\$1 ]"
+                                _service_cmd="$x/\$1 \$2"
+                                break
+                        fi
+                done
+                if [ -e /etc/arch-release ]; then
+                        _service_status="[ -e /var/run/daemons/\$1 ]"
+                fi
+        fi
+
+        _detected_init=true
+        if [ -z "$_service_cmd" ]; then
+                syslog err "could not detect a useable init system"
+                return 1
+        fi
+        return 0
+}
+
 # Check a system service exists 
 service_exists()
 {
-        [ -x /etc/rc.d/$1 ]
+
+        if [ -z "$_service_exists" ]; then
+                detect_init || return 1
+        fi
+        eval $_service_exists
 }
 
 # Send a command to a system service
 service_cmd()
 {
-        /etc/rc.d/$1 $2
+
+        if [ -z "$_service_cmd" ]; then
+                detect_init || return 1
+        fi
+        eval $_service_cmd
 }
 
 # Send a command to a system service if it is running
 service_status()
 {
-        service_command $1 status >/dev/null 2>&1
+
+        if [ -z "$_service_cmd" ]; then
+                detect_init || return 1
+        fi
+        if [ -n "$_service_status" ]; then
+                eval $_service_status
+        else
+                service_command $1 status >/dev/null 2>&1
+        fi
 }
 
 # Handy macros for our hooks
 service_command()
 {
+
         service_exists $1 && service_cmd $1 $2
 }
 service_condcommand()
 {
+
         service_exists $1 && service_status $1 && service_cmd $1 $2
 }