From 290f3e973f1109840e9b388b5646157dc8f6f621a4961fb7616bdde0c2a5ad48 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Mon, 14 Sep 2015 17:40:39 +0000 Subject: [PATCH] - do not guard NetworkManger -- when NM maintainers need it, they will let us know. OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=158 --- dhclient-script | 2 +- dhcp.changes | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dhclient-script b/dhclient-script index 3703edc..14bd43c 100644 --- a/dhclient-script +++ b/dhclient-script @@ -77,7 +77,7 @@ network_service_conflicts() wicked.service) return 1 ;; # NetworkManager is using another script - NetworkManager.service) return 1 ;; + #NetworkManager.service) return 1 ;; # sysconfig network were using it, other? network.service|*) return 0 ;; diff --git a/dhcp.changes b/dhcp.changes index 3add17e..14633be 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -53,9 +53,7 @@ Mon Sep 14 14:39:34 UTC 2015 - mt@suse.de source and binary compatible (bsc#910686). - Corrected changes to provide complete patch file references. - Fixed dhclient to check pre-init results reported by dhclient-script - and fail if pre-init fails for a requested interface (bsc#912098) - Adjusted dhclient-script to fail also if NetworkManager is enabled, - as it is using an own script and a second client causes conflicts. + and fail if pre-init fails for a requested interface (bsc#912098). [+ 0018-client-fail-on-script-pre-init-error-bsc-912098.patch] -------------------------------------------------------------------