diff options
| author | Chris Buechler <cmb@cmb-macbook-pro.local> | 2009-05-18 01:17:08 -0400 |
|---|---|---|
| committer | Chris Buechler <cmb@cmb-macbook-pro.local> | 2009-05-18 01:17:08 -0400 |
| commit | 6785fbfebcfb773c0974f5810c2e02451b1410af (patch) | |
| tree | 44d043617eaf0f4f5b01527d7040692e9ecc4983 | |
| parent | eccd381329417761e48c163c89122d7c608f7047 (diff) | |
| parent | 778858c14edec3df72a711f3bddf42d04f817499 (diff) | |
| download | pfsense-6785fbfebcfb773c0974f5810c2e02451b1410af.zip pfsense-6785fbfebcfb773c0974f5810c2e02451b1410af.tar.gz | |
Merge branch 'RELENG_1_2' of git@rcs.pfsense.org:pfsense/mainline into RELENG_1_2
| -rw-r--r-- | boot/loader.conf | 2 | ||||
| -rw-r--r-- | cf/conf/config.xml | 4 | ||||
| -rw-r--r-- | conf.default/config.xml | 4 | ||||
| -rw-r--r-- | etc/inc/filter.inc | 4 | ||||
| -rw-r--r-- | etc/inc/globals.inc | 3 | ||||
| -rwxr-xr-x | usr/local/www/system_firmware.php | 2 |
6 files changed, 10 insertions, 9 deletions
diff --git a/boot/loader.conf b/boot/loader.conf index 2d4e8b5..2154190 100644 --- a/boot/loader.conf +++ b/boot/loader.conf @@ -5,4 +5,4 @@ hw.ata.wc="0" kern.ipc.nmbclusters="0" beastie_disable="NO" vm.kmem_size="435544320" -vm.kmem_size_max="535544320"
\ No newline at end of file +vm.kmem_size_max="535544320" diff --git a/cf/conf/config.xml b/cf/conf/config.xml index 63ba506..dca1e3d 100644 --- a/cf/conf/config.xml +++ b/cf/conf/config.xml @@ -36,7 +36,7 @@ </system> <interfaces> <lan> - <if>sis0</if> + <if>vr0</if> <ipaddr>192.168.1.1</ipaddr> <subnet>24</subnet> <media></media> @@ -50,7 +50,7 @@ --> </lan> <wan> - <if>sis1</if> + <if>vr1</if> <mtu></mtu> <ipaddr>dhcp</ipaddr> <!-- *or* ipv4-address *or* 'pppoe' *or* 'pptp' *or* 'bigpond' --> diff --git a/conf.default/config.xml b/conf.default/config.xml index 7f590c6..a010995 100644 --- a/conf.default/config.xml +++ b/conf.default/config.xml @@ -35,7 +35,7 @@ </system> <interfaces> <lan> - <if>sis0</if> + <if>vr0</if> <ipaddr>192.168.1.1</ipaddr> <subnet>24</subnet> <media></media> @@ -49,7 +49,7 @@ --> </lan> <wan> - <if>sis1</if> + <if>vr1</if> <mtu></mtu> <ipaddr>dhcp</ipaddr> <!-- *or* ipv4-address *or* 'pppoe' *or* 'pptp' *or* 'bigpond' --> diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 5075d18..7020c10 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -3042,7 +3042,7 @@ function create_firewall_outgoing_rules_to_itself() { /* If the interface has a gateway we do not add a pass in rule. */ /* Some people use a TUN tunnel with public IP as a Multiwan interface */ if(interface_has_gateway("tun{$x}")) { - $rule .= "# Not adding default pass in rule for interface $friendlytunif - tun{$x} with a gateway!"; + $rule .= "# Not adding default pass in rule for interface $friendlytunif - tun{$x} with a gateway!\n"; } elseif (!isset($config['system']['disablevpnrules'])) { $rule .="pass in quick on tun{$x} all keep state label \"let out anything from firewall host itself openvpn\"\n"; } @@ -3055,7 +3055,7 @@ function create_firewall_outgoing_rules_to_itself() { /* If the interface has a gateway we do not add a pass in rule. */ /* Some people use a TAP tunnel with public IP as a Multiwan interface */ if(interface_has_gateway("tap{$x}")) { - $rule .= "# Not adding default pass in rule for interface $friendlytapif - tap{$x} with a gateway!"; + $rule .= "# Not adding default pass in rule for interface $friendlytapif - tap{$x} with a gateway!\n"; } elseif (!isset($config['system']['disablevpnrules'])) { $rule .="pass in quick on tap{$x} all keep state label \"let out anything from firewall host itself openvpn\"\n"; } diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 46da1c1..bb26ee8 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -74,6 +74,7 @@ $g = array( "embeddedbootupslice" => "/dev/ad0a", "update_url" => "http://updates.pfSense.com/_updaters", "update_manifest" => "http://updates.pfSense.com/manifest", + "firmware_update_text" => "(pfSense-*.tgz)", "wireless_regex" => "/^(ndis|wi|ath|an|ral|ural|wai|iwi|awi|wlan|rum)/", "vlan_native_supp" => array("vge", "bfe", "dc", "fxp", "gem", "hme", "rl", "sis", "ste", "tl", "tx", "xl"), "vlan_long_frame" => array("vge", "bfe", "bge", "dc", "em", "fxp", "gem", "hme", "ixgb", "le", "msk", "nge", "re", "rl", "sis", "sk", "ste", "ti", "tl", "tx", "txp", "vr", "xl", "bce", "ixgbe" ) @@ -85,4 +86,4 @@ $iptos = array("lowdelay", "throughput", "reliability"); /* TCP flags */ $tcpflags = array("syn", "ack", "fin", "rst", "psh", "urg"); -?> +?>
\ No newline at end of file diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index 8e668bd..fcecfae 100755 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -197,7 +197,7 @@ print_info_box($sig_warning); <td width="22%" valign="baseline" class="vncell"> </td> <td width="78%" class="vtable"> <p>Click "Enable firmware - upload" below, then choose the image file (<?=$g['platform'];?>-*.tgz) + upload" below, then choose the image file (<?=$g['firmware_update_text'];?>) to be uploaded.<br>Click "Upgrade firmware" to start the upgrade process.</p> <?php if (!file_exists($d_sysrebootreqd_path)): ?> |
