Project

General

Profile

Download (1.36 KB)

Regression #11570 » 11570test.diff

Marcos M, 06/07/2022 08:54 PM

View differences:

src/etc/rc.linkup
118 118 
				 * see https://redmine.pfsense.org/issues/11570 */
119 119 
				if (!$staticv4) {
120 120 
					touch("{$g['tmp_path']}/{$iface}_upstart4");
121 
				}
122 
				if (!$staticv6) {
121 123 
					touch("{$g['tmp_path']}/{$iface}_upstart6");
122 124 
				}
123 125 
				// Do not try to readd to bridge otherwise em(4) has problems
src/etc/rc.newwanip
212 212 
 * could be failing back in which case we need to switch IPs back anyhow.
213 213 
 */
214 214 
if (!is_ipaddr($oldip) || ($curwanip != $oldip) || file_exists("{$g['tmp_path']}/{$interface}_upstart4") ||
215 
    (!is_ipaddrv4($config['interfaces'][$interface]['ipaddr']) && ($config['interfaces'][$interface]['ipaddr'] != 'dhcp'))) {
215 
    (!is_ipaddrv4($config['interfaces'][$interface]['ipaddr']) && ($config['interfaces'][$interface]['ipaddr'] != 'dhcp')) ||
216 
	 ($curwanip == $oldip) && !file_exists("{$g['tmp_path']}/{$interface}_upstart4")) {
216 217 
	/*
217 218 
	 * Some services (e.g. dyndns, see ticket #4066) depend on
218 219 
	 * filter_configure() to be called before, otherwise pass out
(2-2/2)