From b0ad4456ba693c08bb5b644fdc3c98a6d253f29f Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 14 Nov 2016 22:07:01 +0100 Subject: [PATCH] igmpprox: foo for #1256 --- src/etc/inc/services.inc | 14 ++++++++++---- src/etc/rc.bootup | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index e24fae0a3..03febfb6b 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -1351,7 +1351,7 @@ EOD; return 0; } -function services_igmpproxy_configure() +function services_igmpproxy_configure($verbose = false) { global $config; @@ -1359,7 +1359,12 @@ function services_igmpproxy_configure() killbyname("igmpproxy"); if (!isset($config['igmpproxy']['igmpentry']) || !is_array($config['igmpproxy']['igmpentry']) || (count($config['igmpproxy']['igmpentry']) == 0)) { - return 1; + return; + } + + if ($verbose) { + echo 'Started IGMP Proxy...'; + flush(); } $iflist = get_configured_interface_list(); @@ -1407,9 +1412,10 @@ EOD; unset($igmpconf); mwexec('/usr/local/etc/rc.d/igmpproxy onestart'); - log_error('Started IGMP proxy service.'); - return 0; + if ($verbose) { + print "done.\n"; + } } function services_dhcrelay_configure() diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup index 4af06e444..1870252b8 100755 --- a/src/etc/rc.bootup +++ b/src/etc/rc.bootup @@ -238,7 +238,7 @@ if ($kern_hz == '1000') { } /* start the igmpproxy daemon */ -services_igmpproxy_configure(); +services_igmpproxy_configure(true); /* If powerd is enabled, lets launch it */ activate_powerd();