commit dhcp for openSUSE:Factory

[Source-Sync]

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package dhcp for openSUSE:Factory checked in 
at 2022-02-13 19:50:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dhcp (Old)
 and      /work/SRC/openSUSE:Factory/.dhcp.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "dhcp"

Sun Feb 13 19:50:28 2022 rev:131 rq:953760 version:4.4.2.P1

Changes:
--------
--- /work/SRC/openSUSE:Factory/dhcp/dhcp.changes        2022-01-20 
00:12:34.598590891 +0100
+++ /work/SRC/openSUSE:Factory/.dhcp.new.1956/dhcp.changes      2022-02-13 
19:50:37.462145832 +0100
@@ -1,0 +2,7 @@
+Wed Jan 19 09:53:39 UTC 2022 - Manfred Schwarb <manfre...@gmx.ch>
+
+- modify source if-up.d.dhcpd-restart-hook:
+  * fix option parsing
+  * do not call /usr/libexec/dhcp/dhcpd directly, use systemd for it 
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------


++++++ if-up.d.dhcpd-restart-hook ++++++
--- /var/tmp/diff_new_pack.Bjp6OU/_old  2022-02-13 19:50:38.634148954 +0100
+++ /var/tmp/diff_new_pack.Bjp6OU/_new  2022-02-13 19:50:38.634148954 +0100
@@ -44,10 +44,22 @@
 if test "x$2" != x -a "x$2" != "x-o" ; then
         CONFIG=$INTERFACE
         INTERFACE="$2"
+        shift
 else
         CONFIG=$INTERFACE
 fi
+shift
 
+mode=""
+args=$(getopt -o "o:" -- "$@")
+eval set -- "$args"
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --) shift; break;;
+    -o) mode="$2"; shift;;
+  esac
+  shift
+done
 
 . /etc/sysconfig/network/config
 if test -f /etc/sysconfig/network/scripts/functions ; then
@@ -102,7 +114,9 @@
         fi
 
         if test "$restart_needed" = yes ; then
-                @LIBEXECDIR@/dhcp/dhcpd -4 try-restart
+          if test "`/usr/bin/systemctl --value -p SubState show 
dhcpd.service`" = "running"; then
+            /usr/bin/systemctl restart dhcpd.service
+          fi
         fi
 }
 dhcpv6_server_restart()
@@ -140,16 +154,18 @@
         fi
 
         if test "$restart_needed" = yes ; then
-                @LIBEXECDIR@/dhcp/dhcpd -6 try-restart
+          if test "`/usr/bin/systemctl --value -p SubState show 
dhcpd6.service`" = "running"; then
+            /usr/bin/systemctl restart dhcpd6.service
+          fi
         fi
 }
 
-case "$0" in
-*if-up.d*)
+case "$mode" in
+*-up*)
        dhcpv4_server_restart
        dhcpv6_server_restart
 ;;
-*if-down.d*)
+*-down*)
         # don't do anything
 ;;
 *)