From 8c2a607d3727dd6018ef4ac7d38830382a2ec67ae3ed9f9c515a7273c9341a23 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Wed, 10 Dec 2014 14:52:11 +0000 Subject: [PATCH] - fix bashisms in dhcprelay script OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=144 --- dhcp.changes | 5 +++++ dhcrelay.script | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dhcp.changes b/dhcp.changes index adfc136..aee3ce2 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -6,6 +6,11 @@ Wed Dec 10 12:52:03 UTC 2014 - mt@suse.de by the infiniband support patch (bsc#909189,bsc#870535). [+ 0027-dhcp-4.2.x-handle-ifa_addr-NULL.909189.patch] +------------------------------------------------------------------- +Tue Dec 09 19:25:00 UTC 2014 - Led + +- fix bashisms in dhcprelay script + ------------------------------------------------------------------- Thu Nov 20 11:43:07 UTC 2014 - mt@suse.de diff --git a/dhcrelay.script b/dhcrelay.script index 615cbc8..e710202 100644 --- a/dhcrelay.script +++ b/dhcrelay.script @@ -130,9 +130,11 @@ case "$1" in # startproc should return 0, even if service is # already running to match LSB spec. - test "$2" = "-v" && echo -en \ - "\nexecuting '$DAEMON_BIN $DHCPv_OPT $DHCRELAY_OPTIONS $DHCRELAY_ARGS'" - startproc -q -l $STARTPROC_LOGFILE -p $DAEMON_PIDFILE $DAEMON_BIN $DHCPv_OPT $DHCRELAY_OPTIONS $DHCRELAY_ARGS &>/dev/null + if [ "$2" = "-v" ]; then + echo + echo -n "executing '$DAEMON_BIN $DHCPv_OPT $DHCRELAY_OPTIONS $DHCRELAY_ARGS'" + fi + startproc -q -l $STARTPROC_LOGFILE -p $DAEMON_PIDFILE $DAEMON_BIN $DHCPv_OPT $DHCRELAY_OPTIONS $DHCRELAY_ARGS >/dev/null 2>&1 rc=$? if ! [ $rc -eq 0 ]; then ## be verbose