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

Accepting request 213448 from network:dhcp

Browse Source 
- Test if /etc/sysconfig/network/scripts/functions exists before
  sourcing it (fate#316768,bnc#856591).

OBS-URL: https://build.opensuse.org/request/show/213448
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dhcp?expand=0&rev=85
This commit is contained in:
Stephan Kulow 2014-01-13 16:20:08 +00:00 committed by Git OBS Bridge
commit 08abd5db45
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dhclient-script
View File

@ -21,7 +21,9 @@ test "x$reason" = x -o "x$interface" = x && exit 1
# source sysconfig functions
#
SYSCONFIG_CFG_DIR="/etc/sysconfig/network"
. "$SYSCONFIG_CFG_DIR/scripts/functions"
if test -f "$SYSCONFIG_CFG_DIR/scripts/functions" ; then
. "$SYSCONFIG_CFG_DIR/scripts/functions"
fi
SYSCONFIG_RUN_DIR=${SYSCONFIG_RUN_DIR:-/dev/.sysconfig/network}
#

6
dhcp.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jan 10 12:05:22 UTC 2014 - mt@suse.com
- Test if /etc/sysconfig/network/scripts/functions exists before
sourcing it (fate#316768,bnc#856591).
-------------------------------------------------------------------
Mon Nov 18 09:40:55 UTC 2013 - mt@suse.com

2
dhcp.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package dhcp
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed

4
if-up.d.dhcpd-restart-hook
View File

@ -51,7 +51,9 @@ fi
. /etc/sysconfig/network/config
. /etc/sysconfig/network/scripts/functions
if test -f /etc/sysconfig/network/scripts/functions ; then
. /etc/sysconfig/network/scripts/functions
fi
. /etc/sysconfig/dhcpd 2>/dev/null
. /etc/sysconfig/network/ifcfg-"$CONFIG" 2>/dev/null || true