From 729c62eaeb8df05b85296f657a8189b5166a93e4e8bff72ee7721b402ccf97c4 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Fri, 18 Jul 2014 11:30:49 +0000 Subject: [PATCH] - 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. OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=133 --- dhclient-script | 23 ++++++++++++++++++++++- dhcp.changes | 9 +++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dhclient-script b/dhclient-script index 811e899..af8daf7 100644 --- a/dhclient-script +++ b/dhclient-script @@ -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 # @@ -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 @@ if [ "$DEBUG" = yes ]; then 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}" diff --git a/dhcp.changes b/dhcp.changes index 343bf10..8e7c399 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jul 18 11:13:40 UTC 2014 - mt@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. + ------------------------------------------------------------------- Tue Jun 10 02:42:32 UTC 2014 - mt@suse.de