Project

General

Profile

« Previous | Next » 

Revision 77712c1e

Added by Scott Ullrich over 19 years ago

Adjust bringup order. Bring up bridge on wan too

View differences:

etc/inc/interfaces.inc
147 147
		fclose($fd);
148 148
		
149 149
		/* bring up interfaces */
150
		mwexec("/sbin/ifconfig bridge{$bridges_total} down");
151
		usleep(100);
150 152
		mwexec("/sbin/ifconfig {$config['interfaces'][$lancfg['bridge']]['if']} up");
153
		usleep(5);
151 154
		mwexec("/sbin/ifconfig {$lancfg['if']} up");
152
		mwexec("/sbin/ifconfig bridge{$bridges_total} down");
153
		mwexec("/sbin/ifconfig {$lancfg['if']} up");		
155
		usleep(5);
154 156
		mwexec("/sbin/ifconfig bridge{$bridges_total} up");
155 157
	}
156 158
	
......
305 307
			fclose($fd);
306 308
			
307 309
			/* bring up interfaces */
308
			mwexec("/sbin/ifconfig {$config['interfaces'][$optcfg['bridge']]['if']} up");
309
			mwexec("/sbin/ifconfig {$optcfg['if']} up");
310 310
			mwexec("/sbin/ifconfig bridge{$bridges_total} down");
311
			usleep(100);
312
			mwexec("/sbin/ifconfig {$config['interfaces'][$optcfg['bridge']]['if']} up");
313
			usleep(5);
311 314
			mwexec("/sbin/ifconfig {$optcfg['if']} up");
315
			usleep(5);
312 316
			mwexec("/sbin/ifconfig bridge{$bridges_total} up");
313

  
314 317
			
315 318
		} else {
316 319
			/* if user has selected DHCP type then act accordingly */
......
798 801
			filter_configure();
799 802
	}
800 803

  
804
	if ($wancfg['bridge']) {
805
		/* use open/netBSD style bridge */
806
		mwexec("/sbin/ifconfig bridge{$bridges_total} create");
807
		
808
		/* force all bridged interfaces to use same mtu */
809
		$mtu = get_interface_mtu($config['interfaces'][$wancfg['bridge']]['if']);
810
		mwexec("/sbin/ifconfig {$wancfg['if']} mtu {$mtu}");
811
		mwexec("/sbin/ifconfig {$config['interfaces'][$wancfg['bridge']]['if']} mtu {$mtu}");
812
		
813
		/* assign items to a bridge */
814
		mwexec("/sbin/ifconfig bridge{$bridges_total} addm {$wancfg['if']} addm {$config['interfaces'][$wancfg['bridge']]['if']} up");
815
		mwexec("/sbin/ifconfig bridge{$bridges_total} stp {$wancfg['if']} stp {$config['interfaces'][$wancfg['bridge']]['if']}");
816
		
817
		/* log commands run for debugging in /tmp/ */
818
		$fd = fopen("{$g['tmp_path']}/bridge_config_{$wancfg['if']}", "w");
819
		fwrite($fd, "/sbin/ifconfig {$wancfg['if']} mtu {$mtu}\n");
820
		fwrite($fd, "/sbin/ifconfig {$config['interfaces'][$wancfg['bridge']]['if']} mtu {$mtu}\n");
821
		fwrite($fd, "/sbin/ifconfig bridge{$bridges_total} create\n");
822
		fwrite($fd, "/sbin/ifconfig bridge{$bridges_total} addm {$wancfg['if']} addm {$config['interfaces'][$wancfg['bridge']]['if']} up\n");
823
		fwrite($fd, "/sbin/ifconfig bridge{$bridges_total} stp {$wancfg['if']} stp {$config['interfaces'][$wancfg['bridge']]['if']}\n");
824
		fclose($fd);
825
		
826
		/* bring up interfaces */
827
		mwexec("/sbin/ifconfig bridge{$bridges_total} down");
828
		usleep(100);
829
		mwexec("/sbin/ifconfig {$config['interfaces'][$wancfg['bridge']]['if']} up");
830
		usleep(5);
831
		mwexec("/sbin/ifconfig {$wancfg['if']} up");
832
		usleep(5);
833
		mwexec("/sbin/ifconfig bridge{$bridges_total} up");
834
	}
835

  
801 836
	if (!$g['booting']) {
802 837
		/* reconfigure static routes (kernel may have deleted them) */
803 838
		system_routing_configure();

Also available in: Unified diff