From d29de4797de9a3cc3920c55d01b0a2b0c1cf20c61965d84008fb4c522a89d2e4 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Fri, 10 Jan 2014 12:13:49 +0000 Subject: [PATCH] - Test if /etc/sysconfig/network/scripts/functions exists before sourcing it (fate#316768,bnc#856591). OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=117 --- dhclient-script | 4 +++- dhcp.changes | 6 ++++++ dhcp.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dhclient-script b/dhclient-script index 2ecc8f2..d7fd8a5 100644 --- a/dhclient-script +++ b/dhclient-script @@ -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} # diff --git a/dhcp.changes b/dhcp.changes index 217d3f8..bbbbc22 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -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 diff --git a/dhcp.spec b/dhcp.spec index 48d2085..9891c2f 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -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