From 82f4ffb588580298f13dd768f113520464b70cea Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Mon, 11 May 2009 12:54:59 -0400 Subject: [PATCH 1/6] add missing \n's caught by jim-p --- etc/inc/filter.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 5075d18897..7020c10969 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"; } From d0f6edc82a58a07f546a9add538302d338888b5d Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Wed, 13 May 2009 21:57:49 -0400 Subject: [PATCH 2/6] default to vr0/vr1 rather than sis, since the defaults should be for ALIX, not WRAP. --- cf/conf/config.xml | 4 ++-- conf.default/config.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cf/conf/config.xml b/cf/conf/config.xml index 63ba506487..dca1e3df15 100644 --- a/cf/conf/config.xml +++ b/cf/conf/config.xml @@ -36,7 +36,7 @@ - sis0 + vr0 192.168.1.1 24 @@ -50,7 +50,7 @@ --> - sis1 + vr1 dhcp diff --git a/conf.default/config.xml b/conf.default/config.xml index 7f590c649a..a010995b5e 100644 --- a/conf.default/config.xml +++ b/conf.default/config.xml @@ -35,7 +35,7 @@ - sis0 + vr0 192.168.1.1 24 @@ -49,7 +49,7 @@ --> - sis1 + vr1 dhcp From 82cab169ff5be8e731d09e50951432891b9955b9 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Thu, 14 May 2009 20:49:01 -0400 Subject: [PATCH 3/6] Move firmware update text format to globals.inc --- etc/inc/globals.inc | 3 ++- usr/local/www/system_firmware.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 46da1c185f..bb26ee8ccf 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 8e668bd217..fcecfae2c5 100755 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -197,7 +197,7 @@ print_info_box($sig_warning);  

Click "Enable firmware - upload" below, then choose the image file (-*.tgz) + upload" below, then choose the image file () to be uploaded.
Click "Upgrade firmware" to start the upgrade process.

From 802760bda899a181f0f0298ea209865e3b360148 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Fri, 15 May 2009 13:18:23 -0400 Subject: [PATCH 4/6] Use FreeBSD specific files --- boot/loader.conf | 8 -------- boot/loader.rc | 17 ----------------- 2 files changed, 25 deletions(-) delete mode 100644 boot/loader.conf delete mode 100644 boot/loader.rc diff --git a/boot/loader.conf b/boot/loader.conf deleted file mode 100644 index 2d4e8b5112..0000000000 --- a/boot/loader.conf +++ /dev/null @@ -1,8 +0,0 @@ -hw.ata.atapi_dma="0" -hw.ata.ata_dma="0" -loader_color="YES" -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 diff --git a/boot/loader.rc b/boot/loader.rc deleted file mode 100644 index 395231f3b3..0000000000 --- a/boot/loader.rc +++ /dev/null @@ -1,17 +0,0 @@ -\ Loader.rc -\ $FreeBSD: src/sys/boot/i386/loader/loader.rc,v 1.4 2005/10/30 05:41:42 scottl Exp $ -\ -\ Includes additional commands -include /boot/loader.4th - -\ Reads and processes loader.conf variables -start - -\ Tests for password -- executes autoboot first if a password was defined -check-password - -\ Load in the boot menu -include /boot/beastie.4th - -\ Start the boot menu -beastie-start From 1e96ae204a2d96d86e75885075dd2656cf8a8358 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Fri, 15 May 2009 13:20:33 -0400 Subject: [PATCH 5/6] Revert "Use FreeBSD specific files" This reverts commit 802760bda899a181f0f0298ea209865e3b360148. --- boot/loader.conf | 8 ++++++++ boot/loader.rc | 17 +++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 boot/loader.conf create mode 100644 boot/loader.rc diff --git a/boot/loader.conf b/boot/loader.conf new file mode 100644 index 0000000000..2d4e8b5112 --- /dev/null +++ b/boot/loader.conf @@ -0,0 +1,8 @@ +hw.ata.atapi_dma="0" +hw.ata.ata_dma="0" +loader_color="YES" +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 diff --git a/boot/loader.rc b/boot/loader.rc new file mode 100644 index 0000000000..395231f3b3 --- /dev/null +++ b/boot/loader.rc @@ -0,0 +1,17 @@ +\ Loader.rc +\ $FreeBSD: src/sys/boot/i386/loader/loader.rc,v 1.4 2005/10/30 05:41:42 scottl Exp $ +\ +\ Includes additional commands +include /boot/loader.4th + +\ Reads and processes loader.conf variables +start + +\ Tests for password -- executes autoboot first if a password was defined +check-password + +\ Load in the boot menu +include /boot/beastie.4th + +\ Start the boot menu +beastie-start From 778858c14edec3df72a711f3bddf42d04f817499 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Fri, 15 May 2009 22:50:23 -0400 Subject: [PATCH 6/6] Add trailing \n --- boot/loader.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/loader.conf b/boot/loader.conf index 2d4e8b5112..215419083e 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"