From 14c408ee4a36b4e0f9a2238087793058f073d6bd Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Fri, 29 May 2009 08:10:02 +0200 Subject: [PATCH] _updown script fix for ALT Linux, courtesy of Michael Shigorin --- src/_updown/_updown.in | 15 ++++++--------- src/_updown_espmark/_updown_espmark | 15 ++++++--------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/_updown/_updown.in b/src/_updown/_updown.in index 7cbfa5111..838842d06 100644 --- a/src/_updown/_updown.in +++ b/src/_updown/_updown.in @@ -205,15 +205,12 @@ doroute() { if [ -z "$PLUTO_MY_SOURCEIP" ] then - if [ -f /etc/sysconfig/defaultsource ] - then - . /etc/sysconfig/defaultsource - fi - - if [ -f /etc/conf.d/defaultsource ] - then - . /etc/conf.d/defaultsource - fi + for dir in /etc/sysconfig /etc/conf.d; do + if [ -f "$dir/defaultsource" ] + then + . "$dir/defaultsource" + fi + done if [ -n "$DEFAULTSOURCE" ] then diff --git a/src/_updown_espmark/_updown_espmark b/src/_updown_espmark/_updown_espmark index b9ae6ed25..74de0722d 100644 --- a/src/_updown_espmark/_updown_espmark +++ b/src/_updown_espmark/_updown_espmark @@ -199,15 +199,12 @@ doroute() { if [ -z "$PLUTO_MY_SOURCEIP" ] then - if [ -f /etc/sysconfig/defaultsource ] - then - . /etc/sysconfig/defaultsource - fi - - if [ -f /etc/conf.d/defaultsource ] - then - . /etc/conf.d/defaultsource - fi + for dir in /etc/sysconfig /etc/conf.d; do + if [ -f "$dir/defaultsource" ] + then + . "$dir/defaultsource" + fi + done if [ -n "$DEFAULTSOURCE" ] then