pfSense

Resolve merge conflict

Not needed anymore.

Merge remote branch 'upstream/master'

Conflicts:
etc/inc/system.inc

No need to set this here, we already set it in config.inc (and it takes precedence)

Merge remote branch 'upstream/master'

Conflicts:
etc/inc/interfaces.inc
etc/inc/vslb.inc
usr/local/www/interfaces.php

Use pfSense_sync()

Nuke trailing c/r

Hopefully now the reinclusion of config will not override vars.

Allow for creation of a ipv6 tunnel for he.net by creating a gif interface. This is the recommended procedure as advised by he.net
This allows for using ipv6 local and remote addresses, you will need to add a ipv6 default gateway on the routing tab

Move all console related configuration items to config.console.inc. This will mean that these items are not included when the webConfigurator is being used and only on bootup on the console.

Propperly initialize variables so they function is as expected.

Move newer xmlreader code to xmlreader.inc. Restore old xmlparse code to xmlparse.inc. Default to the older xmlparse.inc but add a flag check if /cf/conf/use_xmlreader is present the newer code will be included instead until the remaining bugs can be resolved with it (see rcs for many).

create a config include that just presents $config to the webgui (no boot code being parsed anymore in webgui now)