Accepting request 400416 from network:dhcp

1

OBS-URL: https://build.opensuse.org/request/show/400416
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dhcp?expand=0&rev=100

dhclient-script

@@ -614,7 +614,7 @@ TIMEOUT)
                       dev $interface
 
     set -- $(get_ipv4_default_gw)
-    if [ -n "$1" ] && /sbin/arping -q -c 1 -w 5 -I $interface $1 ;
+    if [ -n "$1" ] && /usr/sbin/arping -q -c 1 -w 5 -I $interface $1 ;
     then
       if [ x$new_ip_address != x$alias_ip_address ] && \
          [ x$alias_ip_address != x ]; then

dhcp.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu May 19 10:37:25 UTC 2016 - mchandras@suse.de
+
+- Use /usr/sbin/arping instead of /sbin/arping in the dhcp scripts.
+  /sbin/arping is a symlink to /usr/sbin/arping in order to ease the
+  transition for the /usr merge. Newest releases of iputils may only
+  install utilities in /usr/* so this dependency will no longer be valid.
+  Moreover, we replace the '/sbin/arping' dependency with 'iputils'.
+
 -------------------------------------------------------------------
 Tue Jan 26 17:16:45 CET 2016 - ndas@suse.de
 

dhcp.spec

@@ -134,10 +134,10 @@ PreReq:         %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /usr/
 %package client
 Summary:        ISC DHCP Client
 Group:          Productivity/Networking/Boot/Clients
-Requires:       /sbin/arping
 Requires:       /usr/bin/host
 Requires:       dhcp = %{version}
 Requires:       iproute2
+Requires:       iputils
 Requires:       net-tools
 PreReq:         %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /bin/grep