Project

General

Profile

« Previous | Next » 

Revision 77abcd71

Added by Jim Pingle over 4 years ago

Only write DHCP6 gw when given a value. Fixes #11454

(cherry picked from commit 78ca7d58c6cc706b5c6aeb8c00c6b4e2b5c841cd)

View differences:

src/etc/inc/interfaces.inc
5139 5139
	unset($dhcp6cscript);
5140 5140
	@chmod("{$g['varetc_path']}/dhcp6c_{$interface}_script.sh", 0755);
5141 5141

  
5142
	$rtsoldscript = "#!/bin/sh\n";
5143
	$rtsoldscript .= "# This shell script launches dhcp6c and configured gateways for this interface.\n";
5144
	$rtsoldscript .= "echo $2 > {$g['tmp_path']}/{$wanif}_routerv6\n";
5145
	$rtsoldscript .= "echo $2 > {$g['tmp_path']}/{$wanif}_defaultgwv6\n";
5146
	$rtsoldscript .= "/usr/bin/logger -t rtsold \"Received RA specifying route \$2 for interface {$interface}({$wanif})\"\n";
5142
	$rtsoldscript = <<<EOD
5143
#!/bin/sh
5144
# This shell script launches dhcp6c and configured gateways for this interface.
5145
if [ -n "\$2" ]; then
5146
	echo \$2 > {$g['tmp_path']}/{$wanif}_routerv6
5147
	echo \$2 > {$g['tmp_path']}/{$wanif}_defaultgwv6
5148
	/usr/bin/logger -t rtsold "Received RA specifying route \$2 for interface {$interface}({$wanif})"
5149
fi
5150

  
5151
EOD;
5147 5152

  
5148 5153
	/* non ipoe Process */
5149 5154
	if (!isset($wancfg['dhcp6withoutra'])) {

Also available in: Unified diff