Hello community,
here is the log from the commit of package dhcp for openSUSE:Factory checked in
at 2014-07-27 08:25:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dhcp (Old)
and /work/SRC/openSUSE:Factory/.dhcp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dhcp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dhcp/dhcp.changes 2014-06-18
07:49:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dhcp.new/dhcp.changes 2014-07-27
08:25:48.000000000 +0200
@@ -1,0 +2,9 @@
+Fri Jul 18 11:13:40 UTC 2014 - m...@suse.de
+
+- Fixed to require iproute2 in dhcp-client package (bnc#885399)
+- Disarmed dhclient-script when wicked is the network service,
+ as wicked is using an another dhcp client (runtime conflict),
+ NetworkManager an own script and sysconfig-network is gone on
+ sles12 and opensuse > 13.1, so it is obsolete and unsupported.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dhcp.spec ++++++
--- /var/tmp/diff_new_pack.Cfk79H/_old 2014-07-27 08:25:49.000000000 +0200
+++ /var/tmp/diff_new_pack.Cfk79H/_new 2014-07-27 08:25:49.000000000 +0200
@@ -141,6 +141,7 @@
Requires: /sbin/arping
Requires: /usr/bin/host
Requires: dhcp = %{version}
+Requires: iproute2
Requires: net-tools
PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp
/bin/grep
++++++ dhclient-script ++++++
--- /var/tmp/diff_new_pack.Cfk79H/_old 2014-07-27 08:25:49.000000000 +0200
+++ /var/tmp/diff_new_pack.Cfk79H/_new 2014-07-27 08:25:49.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (C) 2010 SUSE LINUX Products GmbH / Novell Inc.
+# Copyright (C) 2010-2014 SUSE LINUX Products GmbH / Novell Inc.
#
# Author: Marius Tomaschewski <m...@suse.de>
#
@@ -11,6 +11,10 @@
# It is used by sysconfig alias netcontrol alias ifup-dhcp,
# but not by the NetworkManager that is using an own script.
#
+# Wicked is using an another dhcp client (runtime conflict).
+# As sysconfig-network is gone on sles12 and opensuse > 13.1,
+# this script is obsolete and unsupported.
+#
##
## check mandatory parameters or ignore & exit
@@ -51,6 +55,23 @@
set -x
fi
+network_service_conflicts()
+{
+ local _id=`/usr/bin/systemctl --no-pager -p Id show network.service
2>/dev/null`
+ case "${_id#Id=}" in
+ # wicked is using an another dhcp client
+ wicked.service) return 1 ;;
+
+ # NetworkManager is using another script
+ #NetworkManager.service) return 1 ;;
+
+ # sysconfig network were using it, other?
+ network.service|*) return 0 ;;
+ esac
+}
+
+network_service_conflicts || exit 1
+
is_ifup_controlled()
{
test -f "$SYSCONFIG_RUN_DIR/if-${interface}"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
