rpm/dhcp
SHA256
1
0
Fork 0
forked from pool/dhcp
Code Pull Requests Activity

- do not guard NetworkManger -- when NM maintainers need it,

Browse Source 
they will let us know.

OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=158
This commit is contained in:
Marius Tomaschewski 2015-09-14 17:40:39 +00:00 committed by Git OBS Bridge
parent a78a9d55b7
commit 290f3e973f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dhclient-script
View File

@ -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 ;;

4
dhcp.changes
View File

@ -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]
-------------------------------------------------------------------