From 798bd7ec1d188546a0db8d6f1e8780298a71cc65 Mon Sep 17 00:00:00 2001 From: Martin Wasley Date: Sun, 10 May 2020 07:40:00 +0100 Subject: [PATCH] Add multiple interfaces to rtsold call (#4100) * Add multiple interfaces to rtsold call fix inccorect pid * Update interfaces.inc Change RTSOLD to use -a option and drop interface append Co-authored-by: Martin Wasley --- src/etc/inc/interfaces.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 341a2caf1..261b60ca2 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -2922,17 +2922,17 @@ function interface_dhcpv6_configure($interface = 'wan', $wancfg) set_single_sysctl("net.inet6.ip6.rfc6204w3", "1"); /* always kill rtsold in case of reconfigure */ - killbypid("/var/run/rtsold_{$realifv6}.pid", 'TERM', true); + killbypid("/var/run/rtsold.pid", 'TERM', true); /* fire up rtsold for IPv6 RAs first */ - mwexecf( - '/usr/sbin/rtsold -p %s -O %s -R %s %s %s', + + mwexecf( + '/usr/sbin/rtsold -p %s -O %s -R %s %s -a', array( - "/var/run/rtsold_{$realifv6}.pid", + "/var/run/rtsold.pid", '/var/etc/rtsold_script.sh', '/usr/bin/true', /* XXX missing proper script to refresh resolv.conf */ empty($syscfg['dhcp6_debug']) ? '-d' : '-D', - $realifv6 ) );