[ptxdist] [PATCH] Init script was ignoring OPTIONS variable

[ptxdist] [PATCH] Init script was ignoring OPTIONS variable

[Guillermo Rodriguez]

The init script defines an OPTIONS variable (which can be overriden by
an additional config file in /etc/default/avahi-daemon) but then ignores
this OPTIONS variable when starting the daemon.
---
 generic/etc/init.d/avahi-daemon |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/generic/etc/init.d/avahi-daemon b/generic/etc/init.d/avahi-daemon
index 7dc8be6..27c22cc 100644
--- a/generic/etc/init.d/avahi-daemon
+++ b/generic/etc/init.d/avahi-daemon
@@ -13,7 +13,7 @@ test -f /etc/default/avahi-daemon && . /etc/default/avahi-daemon
 
 start_proc(){
 $BINARY -c && return 0
-$BINARY -D
+$BINARY $OPTIONS
 case $? in
 	0)
 	echo " [+] (avahi-daemon)"
-- 
1.7.0.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] Init script was ignoring OPTIONS variable

[Michael Olbrich]

On Tue, Feb 10, 2015 at 01:50:13PM +0100, Guillermo Rodriguez wrote:
> The init script defines an OPTIONS variable (which can be overriden by
> an additional config file in /etc/default/avahi-daemon) but then ignores
> this OPTIONS variable when starting the daemon.

Thanks, applied.

Michael

> ---
>  generic/etc/init.d/avahi-daemon |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/generic/etc/init.d/avahi-daemon b/generic/etc/init.d/avahi-daemon
> index 7dc8be6..27c22cc 100644
> --- a/generic/etc/init.d/avahi-daemon
> +++ b/generic/etc/init.d/avahi-daemon
> @@ -13,7 +13,7 @@ test -f /etc/default/avahi-daemon && . /etc/default/avahi-daemon
>  
>  start_proc(){
>  $BINARY -c && return 0
> -$BINARY -D
> +$BINARY $OPTIONS
>  case $? in
>  	0)
>  	echo " [+] (avahi-daemon)"
> -- 
> 1.7.0.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de