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

- Fixed to require iproute2 in dhcp-client package (bnc#885399)

Browse Source 
- 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
This commit is contained in:
Marius Tomaschewski 2014-07-18 11:30:49 +00:00 committed by Git OBS Bridge
parent cdb81fcfb3
commit 729c62eaeb
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dhclient-script
View File

@ -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 <mt@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 @@ 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}"

9
dhcp.changes
View File

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