From cb3c90c473040dbff7f2cca758b466f88402adbe Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 9 Dec 2014 11:18:30 +0100
Subject: [PATCH] inc: move to new home in /usr/local/etc

---
 etc/pfSense.obsoletedfiles                    |  3 --
 etc/rc                                        |  8 ++---
 etc/rc.bootup                                 | 30 +++++++++----------
 etc/rc.firmware_auto                          |  4 +--
 etc/rc.initial                                |  4 +--
 etc/rc.php_ini_setup                          |  4 +--
 etc/rc.shutdown                               |  2 +-
 {etc => usr/local/etc}/inc/CHAP.inc           |  0
 {etc => usr/local/etc}/inc/IPv6.inc           |  0
 {etc => usr/local/etc}/inc/PEAR.inc           |  0
 .../local/etc}/inc/array_intersect_key.inc    |  0
 {etc => usr/local/etc}/inc/auth.inc           |  0
 {etc => usr/local/etc}/inc/authgui.inc        |  0
 .../local/etc}/inc/basic_sasl_client.inc      |  0
 {etc => usr/local/etc}/inc/captiveportal.inc  |  0
 {etc => usr/local/etc}/inc/certs.inc          |  0
 {etc => usr/local/etc}/inc/config.console.inc |  0
 {etc => usr/local/etc}/inc/config.gui.inc     |  0
 {etc => usr/local/etc}/inc/config.inc         |  0
 {etc => usr/local/etc}/inc/config.lib.inc     |  0
 .../local/etc}/inc/cram_md5_sasl_client.inc   |  0
 {etc => usr/local/etc}/inc/crypt.inc          |  0
 .../local/etc}/inc/digest_sasl_client.inc     |  0
 {etc => usr/local/etc}/inc/dyndns.class       |  0
 {etc => usr/local/etc}/inc/easyrule.inc       |  0
 {etc => usr/local/etc}/inc/filter.inc         |  0
 {etc => usr/local/etc}/inc/filter_log.inc     |  0
 {etc => usr/local/etc}/inc/functions.inc      |  0
 {etc => usr/local/etc}/inc/globals.inc        |  0
 {etc => usr/local/etc}/inc/gmirror.inc        |  0
 {etc => usr/local/etc}/inc/growl.class        |  0
 {etc => usr/local/etc}/inc/gwlb.inc           |  0
 {etc => usr/local/etc}/inc/interfaces.inc     |  0
 .../local/etc}/inc/ipsec.attributes.php       |  0
 .../local/etc}/inc/ipsec.auth-user.php        |  0
 {etc => usr/local/etc}/inc/ipsec.inc          |  0
 {etc => usr/local/etc}/inc/itemid.inc         |  0
 {etc => usr/local/etc}/inc/led.inc            |  0
 .../local/etc}/inc/login_sasl_client.inc      |  0
 {etc => usr/local/etc}/inc/meta.inc           |  0
 {etc => usr/local/etc}/inc/notices.inc        |  0
 .../local/etc}/inc/ntlm_sasl_client.inc       |  0
 .../local/etc}/inc/openvpn.attributes.php     |  0
 .../local/etc}/inc/openvpn.auth-user.php      |  0
 {etc => usr/local/etc}/inc/openvpn.inc        |  0
 .../local/etc}/inc/openvpn.tls-verify.php     |  0
 {etc => usr/local/etc}/inc/pfsense-utils.inc  |  0
 {etc => usr/local/etc}/inc/pkg-utils.inc      |  0
 .../local/etc}/inc/plain_sasl_client.inc      |  0
 {etc => usr/local/etc}/inc/priv.defs.inc      |  0
 {etc => usr/local/etc}/inc/priv.inc           |  0
 {etc => usr/local/etc}/inc/priv/user.priv.inc |  0
 {etc => usr/local/etc}/inc/r53.class          |  0
 {etc => usr/local/etc}/inc/radius.inc         |  0
 {etc => usr/local/etc}/inc/rrd.inc            |  0
 {etc => usr/local/etc}/inc/sasl.inc           |  0
 {etc => usr/local/etc}/inc/service-utils.inc  |  0
 {etc => usr/local/etc}/inc/services.inc       |  0
 {etc => usr/local/etc}/inc/shaper.inc         |  0
 .../local/etc}/inc/simplepie/LICENSE.txt      |  0
 .../local/etc}/inc/simplepie/simplepie.inc    |  0
 {etc => usr/local/etc}/inc/smtp.inc           |  0
 {etc => usr/local/etc}/inc/system.inc         |  0
 {etc => usr/local/etc}/inc/unbound.inc        |  0
 {etc => usr/local/etc}/inc/upgrade_config.inc |  0
 {etc => usr/local/etc}/inc/util.inc           |  0
 {etc => usr/local/etc}/inc/uuid.php           |  0
 {etc => usr/local/etc}/inc/voucher.inc        |  0
 {etc => usr/local/etc}/inc/vpn.inc            |  0
 {etc => usr/local/etc}/inc/vslb.inc           |  0
 {etc => usr/local/etc}/inc/wizardapp.inc      |  0
 {etc => usr/local/etc}/inc/xmlparse.inc       |  0
 {etc => usr/local/etc}/inc/xmlparse_attr.inc  |  0
 {etc => usr/local/etc}/inc/xmlreader.inc      |  0
 {etc => usr/local/etc}/inc/xmlrpc.inc         |  0
 {etc => usr/local/etc}/inc/xmlrpc_client.inc  |  0
 {etc => usr/local/etc}/inc/xmlrpc_server.inc  |  0
 usr/local/sbin/ovpn_auth_verify               |  4 +--
 usr/local/www/system_usermanager.php          |  6 ++--
 .../backend/functions-bsdlabel.sh             |  2 +-
 80 files changed, 30 insertions(+), 37 deletions(-)
 rename {etc => usr/local/etc}/inc/CHAP.inc (100%)
 rename {etc => usr/local/etc}/inc/IPv6.inc (100%)
 rename {etc => usr/local/etc}/inc/PEAR.inc (100%)
 rename {etc => usr/local/etc}/inc/array_intersect_key.inc (100%)
 rename {etc => usr/local/etc}/inc/auth.inc (100%)
 rename {etc => usr/local/etc}/inc/authgui.inc (100%)
 rename {etc => usr/local/etc}/inc/basic_sasl_client.inc (100%)
 rename {etc => usr/local/etc}/inc/captiveportal.inc (100%)
 rename {etc => usr/local/etc}/inc/certs.inc (100%)
 rename {etc => usr/local/etc}/inc/config.console.inc (100%)
 rename {etc => usr/local/etc}/inc/config.gui.inc (100%)
 rename {etc => usr/local/etc}/inc/config.inc (100%)
 rename {etc => usr/local/etc}/inc/config.lib.inc (100%)
 rename {etc => usr/local/etc}/inc/cram_md5_sasl_client.inc (100%)
 rename {etc => usr/local/etc}/inc/crypt.inc (100%)
 rename {etc => usr/local/etc}/inc/digest_sasl_client.inc (100%)
 rename {etc => usr/local/etc}/inc/dyndns.class (100%)
 rename {etc => usr/local/etc}/inc/easyrule.inc (100%)
 rename {etc => usr/local/etc}/inc/filter.inc (100%)
 rename {etc => usr/local/etc}/inc/filter_log.inc (100%)
 rename {etc => usr/local/etc}/inc/functions.inc (100%)
 rename {etc => usr/local/etc}/inc/globals.inc (100%)
 rename {etc => usr/local/etc}/inc/gmirror.inc (100%)
 rename {etc => usr/local/etc}/inc/growl.class (100%)
 rename {etc => usr/local/etc}/inc/gwlb.inc (100%)
 rename {etc => usr/local/etc}/inc/interfaces.inc (100%)
 rename {etc => usr/local/etc}/inc/ipsec.attributes.php (100%)
 rename {etc => usr/local/etc}/inc/ipsec.auth-user.php (100%)
 rename {etc => usr/local/etc}/inc/ipsec.inc (100%)
 rename {etc => usr/local/etc}/inc/itemid.inc (100%)
 rename {etc => usr/local/etc}/inc/led.inc (100%)
 rename {etc => usr/local/etc}/inc/login_sasl_client.inc (100%)
 rename {etc => usr/local/etc}/inc/meta.inc (100%)
 rename {etc => usr/local/etc}/inc/notices.inc (100%)
 rename {etc => usr/local/etc}/inc/ntlm_sasl_client.inc (100%)
 rename {etc => usr/local/etc}/inc/openvpn.attributes.php (100%)
 rename {etc => usr/local/etc}/inc/openvpn.auth-user.php (100%)
 rename {etc => usr/local/etc}/inc/openvpn.inc (100%)
 rename {etc => usr/local/etc}/inc/openvpn.tls-verify.php (100%)
 rename {etc => usr/local/etc}/inc/pfsense-utils.inc (100%)
 rename {etc => usr/local/etc}/inc/pkg-utils.inc (100%)
 rename {etc => usr/local/etc}/inc/plain_sasl_client.inc (100%)
 rename {etc => usr/local/etc}/inc/priv.defs.inc (100%)
 rename {etc => usr/local/etc}/inc/priv.inc (100%)
 rename {etc => usr/local/etc}/inc/priv/user.priv.inc (100%)
 rename {etc => usr/local/etc}/inc/r53.class (100%)
 rename {etc => usr/local/etc}/inc/radius.inc (100%)
 rename {etc => usr/local/etc}/inc/rrd.inc (100%)
 rename {etc => usr/local/etc}/inc/sasl.inc (100%)
 rename {etc => usr/local/etc}/inc/service-utils.inc (100%)
 rename {etc => usr/local/etc}/inc/services.inc (100%)
 rename {etc => usr/local/etc}/inc/shaper.inc (100%)
 rename {etc => usr/local/etc}/inc/simplepie/LICENSE.txt (100%)
 rename {etc => usr/local/etc}/inc/simplepie/simplepie.inc (100%)
 rename {etc => usr/local/etc}/inc/smtp.inc (100%)
 rename {etc => usr/local/etc}/inc/system.inc (100%)
 rename {etc => usr/local/etc}/inc/unbound.inc (100%)
 rename {etc => usr/local/etc}/inc/upgrade_config.inc (100%)
 rename {etc => usr/local/etc}/inc/util.inc (100%)
 rename {etc => usr/local/etc}/inc/uuid.php (100%)
 rename {etc => usr/local/etc}/inc/voucher.inc (100%)
 rename {etc => usr/local/etc}/inc/vpn.inc (100%)
 rename {etc => usr/local/etc}/inc/vslb.inc (100%)
 rename {etc => usr/local/etc}/inc/wizardapp.inc (100%)
 rename {etc => usr/local/etc}/inc/xmlparse.inc (100%)
 rename {etc => usr/local/etc}/inc/xmlparse_attr.inc (100%)
 rename {etc => usr/local/etc}/inc/xmlreader.inc (100%)
 rename {etc => usr/local/etc}/inc/xmlrpc.inc (100%)
 rename {etc => usr/local/etc}/inc/xmlrpc_client.inc (100%)
 rename {etc => usr/local/etc}/inc/xmlrpc_server.inc (100%)

diff --git a/etc/pfSense.obsoletedfiles b/etc/pfSense.obsoletedfiles
index 6c60bfb6f..f9dbc9a53 100644
--- a/etc/pfSense.obsoletedfiles
+++ b/etc/pfSense.obsoletedfiles
@@ -1,9 +1,6 @@
 /etc/rc.parse-isc-dhcpd
 /etc/rc.linkup.sh
 /etc/phpshellsessions/cvssync
-/etc/inc/cmd_chain.inc
-/etc/inc/regdomain.inc
-/etc/inc/sysctl.inc
 /usr/local/www/diag_showbogons.php
 /usr/local/www/interfaces_wan.php
 /usr/local/www/interfaces_lan.php
diff --git a/etc/rc b/etc/rc
index b8fb2fd80..54d4085fa 100755
--- a/etc/rc
+++ b/etc/rc
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $Id$
-
 # /etc/rc - master bootup script, invokes php setup
 # part of pfSense by Scott Ullrich
 # Copyright (C) 2004-2010 Scott Ullrich, All rights reserved.
@@ -148,9 +146,9 @@ fi
 rm -f /etc/spwd.db.tmp
 /usr/sbin/pwd_mkdb -d /etc/ /etc/master.passwd
 
-product=`/usr/bin/grep product_name /etc/inc/globals.inc | /usr/bin/cut -d'"' -f4`
-hideplatform=`/usr/bin/grep hideplatform /etc/inc/globals.inc | /usr/bin/wc -l`
-varrunpath=`/usr/bin/grep varrun_path /etc/inc/globals.inc | /usr/bin/cut -d'"' -f4`
+product=`/usr/bin/grep product_name /usr/local/etc/inc/globals.inc | /usr/bin/cut -d'"' -f4`
+hideplatform=`/usr/bin/grep hideplatform /usr/local/etc/inc/globals.inc | /usr/bin/wc -l`
+varrunpath=`/usr/bin/grep varrun_path /usr/local/etc/inc/globals.inc | /usr/bin/cut -d'"' -f4`
 
 if [ "$PLATFORM" = "pfSense" ] && [ ${USE_MFS_TMPVAR} -eq 0 ]; then
 	/sbin/mdmfs -S -M -s 4m md $varrunpath
diff --git a/etc/rc.bootup b/etc/rc.bootup
index 456e88434..a154c9500 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -85,9 +85,9 @@ echo " done.\n";
 
 echo "Initializing...";
 echo ".";
-require_once("/etc/inc/globals.inc");
+require_once("globals.inc");
 echo ".";
-require_once("/etc/inc/led.inc");
+require_once("led.inc");
 led_normalize();
 echo ".";
 if (led_count() >= 3) {
@@ -99,29 +99,29 @@ $pkg_interface = 'console';
 $g['booting'] = true;
 
 /* parse the configuration and include all functions used below */
-require_once("/etc/inc/config.inc");
+require_once("config.inc");
 echo ".";
-require_once("/etc/inc/config.console.inc");
+require_once("config.console.inc");
 echo ".";
-require_once("/etc/inc/auth.inc");
+require_once("auth.inc");
 echo ".";
-require_once("/etc/inc/functions.inc");
+require_once("functions.inc");
 echo ".";
-require_once("/etc/inc/filter.inc");
+require_once("filter.inc");
 echo ".";
-require_once("/etc/inc/shaper.inc");
+require_once("shaper.inc");
 echo ".";
-require_once("/etc/inc/ipsec.inc");
+require_once("ipsec.inc");
 echo ".";
-require_once("/etc/inc/vpn.inc");
+require_once("vpn.inc");
 echo ".";
-require_once("/etc/inc/openvpn.inc");
+require_once("openvpn.inc");
 echo ".";
-require_once("/etc/inc/captiveportal.inc");
+require_once("captiveportal.inc");
 echo ".";
-require_once("/etc/inc/rrd.inc");
+require_once("rrd.inc");
 echo ".";
-require_once("/etc/inc/pfsense-utils.inc");
+require_once("pfsense-utils.inc");
 echo ".";
 
 /* get system memory amount */
@@ -388,7 +388,7 @@ if($config['system']['afterbootupshellcmd'] <> "") {
 }
 
 if($physmem < $g['minimum_ram_warning']) {
-	require_once("/etc/inc/notices.inc");
+	require_once("notices.inc");
 	file_notice("{$g['product_name']}MemoryRequirements", "{$g['product_name']} requires at least {$g['minimum_ram_warning_text']} of RAM.  Expect unusual performance.  This platform is not supported.", "Memory", "", 1);
 	set_sysctl(array(
 		"net.inet.tcp.recvspace" => "4096",
diff --git a/etc/rc.firmware_auto b/etc/rc.firmware_auto
index be5da9196..51031748c 100755
--- a/etc/rc.firmware_auto
+++ b/etc/rc.firmware_auto
@@ -1,12 +1,10 @@
 #!/bin/sh
 
-# $Id$
-
 FMBASEURL=$1
 FMFILENAME=$2
 FETCHFILENAME=$1/$2
 
-product=`cat /etc/inc/globals.inc | grep product_name | cut -d'"' -f4`
+product=`cat /usr/local/etc/inc/globals.inc | grep product_name | cut -d'"' -f4`
 
 # wait 5 seconds before beginning
 sleep 5
diff --git a/etc/rc.initial b/etc/rc.initial
index 25ee5e4b0..8810a83ee 100755
--- a/etc/rc.initial
+++ b/etc/rc.initial
@@ -58,8 +58,8 @@ fi
 
 /etc/rc.banner
 
-product=`grep product_name /etc/inc/globals.inc | cut -d'"' -f4`
-hidebanner=`grep hidebanner /etc/inc/globals.inc | cut -d'"' -f4`
+product=`grep product_name /usr/local/etc/inc/globals.inc | cut -d'"' -f4`
+hidebanner=`grep hidebanner /usr/local/etc/inc/globals.inc | cut -d'"' -f4`
 
 # Check to see if SSH is running.
 if pgrep -q -a -F /var/run/sshd.pid sshd >/dev/null 2>&1; then
diff --git a/etc/rc.php_ini_setup b/etc/rc.php_ini_setup
index 989701fdc..64659a1da 100755
--- a/etc/rc.php_ini_setup
+++ b/etc/rc.php_ini_setup
@@ -41,7 +41,7 @@ fi
 
 # Set upload directory
 if [ "$PLATFORM" = "nanobsd" ]; then
-	UPLOADTMPDIR=`/usr/bin/grep upload_path /etc/inc/globals.inc | /usr/bin/cut -d'"' -f4`
+	UPLOADTMPDIR=`/usr/bin/grep upload_path /usr/local/etc/inc/globals.inc | /usr/bin/cut -d'"' -f4`
 else 
 	UPLOADTMPDIR="/tmp"
 fi
@@ -128,7 +128,7 @@ post_max_size = 200M
 html_errors = Off
 zlib.output_compression = Off
 zlib.output_compression_level = 1
-include_path = ".:/etc/inc:/usr/local/www:/usr/local/captiveportal:/usr/local/pkg"
+include_path = ".:/usr/local/etc/inc:/usr/local/www:/usr/local/captiveportal:/usr/local/pkg"
 display_startup_errors=on
 error_reporting = E_ERROR
 display_errors=on
diff --git a/etc/rc.shutdown b/etc/rc.shutdown
index 2102ff476..305ae7c01 100755
--- a/etc/rc.shutdown
+++ b/etc/rc.shutdown
@@ -5,7 +5,7 @@ if ! /usr/bin/lockf -s -t 30 /tmp/config.lock /usr/bin/true; then
 	exit -1
 fi
 
-product=`cat /etc/inc/globals.inc | grep product_name | cut -d'"' -f4`
+product=`cat /usr/local/etc/inc/globals.inc | grep product_name | cut -d'"' -f4`
         
 echo
 echo "${product} is now shutting down ..."
diff --git a/etc/inc/CHAP.inc b/usr/local/etc/inc/CHAP.inc
similarity index 100%
rename from etc/inc/CHAP.inc
rename to usr/local/etc/inc/CHAP.inc
diff --git a/etc/inc/IPv6.inc b/usr/local/etc/inc/IPv6.inc
similarity index 100%
rename from etc/inc/IPv6.inc
rename to usr/local/etc/inc/IPv6.inc
diff --git a/etc/inc/PEAR.inc b/usr/local/etc/inc/PEAR.inc
similarity index 100%
rename from etc/inc/PEAR.inc
rename to usr/local/etc/inc/PEAR.inc
diff --git a/etc/inc/array_intersect_key.inc b/usr/local/etc/inc/array_intersect_key.inc
similarity index 100%
rename from etc/inc/array_intersect_key.inc
rename to usr/local/etc/inc/array_intersect_key.inc
diff --git a/etc/inc/auth.inc b/usr/local/etc/inc/auth.inc
similarity index 100%
rename from etc/inc/auth.inc
rename to usr/local/etc/inc/auth.inc
diff --git a/etc/inc/authgui.inc b/usr/local/etc/inc/authgui.inc
similarity index 100%
rename from etc/inc/authgui.inc
rename to usr/local/etc/inc/authgui.inc
diff --git a/etc/inc/basic_sasl_client.inc b/usr/local/etc/inc/basic_sasl_client.inc
similarity index 100%
rename from etc/inc/basic_sasl_client.inc
rename to usr/local/etc/inc/basic_sasl_client.inc
diff --git a/etc/inc/captiveportal.inc b/usr/local/etc/inc/captiveportal.inc
similarity index 100%
rename from etc/inc/captiveportal.inc
rename to usr/local/etc/inc/captiveportal.inc
diff --git a/etc/inc/certs.inc b/usr/local/etc/inc/certs.inc
similarity index 100%
rename from etc/inc/certs.inc
rename to usr/local/etc/inc/certs.inc
diff --git a/etc/inc/config.console.inc b/usr/local/etc/inc/config.console.inc
similarity index 100%
rename from etc/inc/config.console.inc
rename to usr/local/etc/inc/config.console.inc
diff --git a/etc/inc/config.gui.inc b/usr/local/etc/inc/config.gui.inc
similarity index 100%
rename from etc/inc/config.gui.inc
rename to usr/local/etc/inc/config.gui.inc
diff --git a/etc/inc/config.inc b/usr/local/etc/inc/config.inc
similarity index 100%
rename from etc/inc/config.inc
rename to usr/local/etc/inc/config.inc
diff --git a/etc/inc/config.lib.inc b/usr/local/etc/inc/config.lib.inc
similarity index 100%
rename from etc/inc/config.lib.inc
rename to usr/local/etc/inc/config.lib.inc
diff --git a/etc/inc/cram_md5_sasl_client.inc b/usr/local/etc/inc/cram_md5_sasl_client.inc
similarity index 100%
rename from etc/inc/cram_md5_sasl_client.inc
rename to usr/local/etc/inc/cram_md5_sasl_client.inc
diff --git a/etc/inc/crypt.inc b/usr/local/etc/inc/crypt.inc
similarity index 100%
rename from etc/inc/crypt.inc
rename to usr/local/etc/inc/crypt.inc
diff --git a/etc/inc/digest_sasl_client.inc b/usr/local/etc/inc/digest_sasl_client.inc
similarity index 100%
rename from etc/inc/digest_sasl_client.inc
rename to usr/local/etc/inc/digest_sasl_client.inc
diff --git a/etc/inc/dyndns.class b/usr/local/etc/inc/dyndns.class
similarity index 100%
rename from etc/inc/dyndns.class
rename to usr/local/etc/inc/dyndns.class
diff --git a/etc/inc/easyrule.inc b/usr/local/etc/inc/easyrule.inc
similarity index 100%
rename from etc/inc/easyrule.inc
rename to usr/local/etc/inc/easyrule.inc
diff --git a/etc/inc/filter.inc b/usr/local/etc/inc/filter.inc
similarity index 100%
rename from etc/inc/filter.inc
rename to usr/local/etc/inc/filter.inc
diff --git a/etc/inc/filter_log.inc b/usr/local/etc/inc/filter_log.inc
similarity index 100%
rename from etc/inc/filter_log.inc
rename to usr/local/etc/inc/filter_log.inc
diff --git a/etc/inc/functions.inc b/usr/local/etc/inc/functions.inc
similarity index 100%
rename from etc/inc/functions.inc
rename to usr/local/etc/inc/functions.inc
diff --git a/etc/inc/globals.inc b/usr/local/etc/inc/globals.inc
similarity index 100%
rename from etc/inc/globals.inc
rename to usr/local/etc/inc/globals.inc
diff --git a/etc/inc/gmirror.inc b/usr/local/etc/inc/gmirror.inc
similarity index 100%
rename from etc/inc/gmirror.inc
rename to usr/local/etc/inc/gmirror.inc
diff --git a/etc/inc/growl.class b/usr/local/etc/inc/growl.class
similarity index 100%
rename from etc/inc/growl.class
rename to usr/local/etc/inc/growl.class
diff --git a/etc/inc/gwlb.inc b/usr/local/etc/inc/gwlb.inc
similarity index 100%
rename from etc/inc/gwlb.inc
rename to usr/local/etc/inc/gwlb.inc
diff --git a/etc/inc/interfaces.inc b/usr/local/etc/inc/interfaces.inc
similarity index 100%
rename from etc/inc/interfaces.inc
rename to usr/local/etc/inc/interfaces.inc
diff --git a/etc/inc/ipsec.attributes.php b/usr/local/etc/inc/ipsec.attributes.php
similarity index 100%
rename from etc/inc/ipsec.attributes.php
rename to usr/local/etc/inc/ipsec.attributes.php
diff --git a/etc/inc/ipsec.auth-user.php b/usr/local/etc/inc/ipsec.auth-user.php
similarity index 100%
rename from etc/inc/ipsec.auth-user.php
rename to usr/local/etc/inc/ipsec.auth-user.php
diff --git a/etc/inc/ipsec.inc b/usr/local/etc/inc/ipsec.inc
similarity index 100%
rename from etc/inc/ipsec.inc
rename to usr/local/etc/inc/ipsec.inc
diff --git a/etc/inc/itemid.inc b/usr/local/etc/inc/itemid.inc
similarity index 100%
rename from etc/inc/itemid.inc
rename to usr/local/etc/inc/itemid.inc
diff --git a/etc/inc/led.inc b/usr/local/etc/inc/led.inc
similarity index 100%
rename from etc/inc/led.inc
rename to usr/local/etc/inc/led.inc
diff --git a/etc/inc/login_sasl_client.inc b/usr/local/etc/inc/login_sasl_client.inc
similarity index 100%
rename from etc/inc/login_sasl_client.inc
rename to usr/local/etc/inc/login_sasl_client.inc
diff --git a/etc/inc/meta.inc b/usr/local/etc/inc/meta.inc
similarity index 100%
rename from etc/inc/meta.inc
rename to usr/local/etc/inc/meta.inc
diff --git a/etc/inc/notices.inc b/usr/local/etc/inc/notices.inc
similarity index 100%
rename from etc/inc/notices.inc
rename to usr/local/etc/inc/notices.inc
diff --git a/etc/inc/ntlm_sasl_client.inc b/usr/local/etc/inc/ntlm_sasl_client.inc
similarity index 100%
rename from etc/inc/ntlm_sasl_client.inc
rename to usr/local/etc/inc/ntlm_sasl_client.inc
diff --git a/etc/inc/openvpn.attributes.php b/usr/local/etc/inc/openvpn.attributes.php
similarity index 100%
rename from etc/inc/openvpn.attributes.php
rename to usr/local/etc/inc/openvpn.attributes.php
diff --git a/etc/inc/openvpn.auth-user.php b/usr/local/etc/inc/openvpn.auth-user.php
similarity index 100%
rename from etc/inc/openvpn.auth-user.php
rename to usr/local/etc/inc/openvpn.auth-user.php
diff --git a/etc/inc/openvpn.inc b/usr/local/etc/inc/openvpn.inc
similarity index 100%
rename from etc/inc/openvpn.inc
rename to usr/local/etc/inc/openvpn.inc
diff --git a/etc/inc/openvpn.tls-verify.php b/usr/local/etc/inc/openvpn.tls-verify.php
similarity index 100%
rename from etc/inc/openvpn.tls-verify.php
rename to usr/local/etc/inc/openvpn.tls-verify.php
diff --git a/etc/inc/pfsense-utils.inc b/usr/local/etc/inc/pfsense-utils.inc
similarity index 100%
rename from etc/inc/pfsense-utils.inc
rename to usr/local/etc/inc/pfsense-utils.inc
diff --git a/etc/inc/pkg-utils.inc b/usr/local/etc/inc/pkg-utils.inc
similarity index 100%
rename from etc/inc/pkg-utils.inc
rename to usr/local/etc/inc/pkg-utils.inc
diff --git a/etc/inc/plain_sasl_client.inc b/usr/local/etc/inc/plain_sasl_client.inc
similarity index 100%
rename from etc/inc/plain_sasl_client.inc
rename to usr/local/etc/inc/plain_sasl_client.inc
diff --git a/etc/inc/priv.defs.inc b/usr/local/etc/inc/priv.defs.inc
similarity index 100%
rename from etc/inc/priv.defs.inc
rename to usr/local/etc/inc/priv.defs.inc
diff --git a/etc/inc/priv.inc b/usr/local/etc/inc/priv.inc
similarity index 100%
rename from etc/inc/priv.inc
rename to usr/local/etc/inc/priv.inc
diff --git a/etc/inc/priv/user.priv.inc b/usr/local/etc/inc/priv/user.priv.inc
similarity index 100%
rename from etc/inc/priv/user.priv.inc
rename to usr/local/etc/inc/priv/user.priv.inc
diff --git a/etc/inc/r53.class b/usr/local/etc/inc/r53.class
similarity index 100%
rename from etc/inc/r53.class
rename to usr/local/etc/inc/r53.class
diff --git a/etc/inc/radius.inc b/usr/local/etc/inc/radius.inc
similarity index 100%
rename from etc/inc/radius.inc
rename to usr/local/etc/inc/radius.inc
diff --git a/etc/inc/rrd.inc b/usr/local/etc/inc/rrd.inc
similarity index 100%
rename from etc/inc/rrd.inc
rename to usr/local/etc/inc/rrd.inc
diff --git a/etc/inc/sasl.inc b/usr/local/etc/inc/sasl.inc
similarity index 100%
rename from etc/inc/sasl.inc
rename to usr/local/etc/inc/sasl.inc
diff --git a/etc/inc/service-utils.inc b/usr/local/etc/inc/service-utils.inc
similarity index 100%
rename from etc/inc/service-utils.inc
rename to usr/local/etc/inc/service-utils.inc
diff --git a/etc/inc/services.inc b/usr/local/etc/inc/services.inc
similarity index 100%
rename from etc/inc/services.inc
rename to usr/local/etc/inc/services.inc
diff --git a/etc/inc/shaper.inc b/usr/local/etc/inc/shaper.inc
similarity index 100%
rename from etc/inc/shaper.inc
rename to usr/local/etc/inc/shaper.inc
diff --git a/etc/inc/simplepie/LICENSE.txt b/usr/local/etc/inc/simplepie/LICENSE.txt
similarity index 100%
rename from etc/inc/simplepie/LICENSE.txt
rename to usr/local/etc/inc/simplepie/LICENSE.txt
diff --git a/etc/inc/simplepie/simplepie.inc b/usr/local/etc/inc/simplepie/simplepie.inc
similarity index 100%
rename from etc/inc/simplepie/simplepie.inc
rename to usr/local/etc/inc/simplepie/simplepie.inc
diff --git a/etc/inc/smtp.inc b/usr/local/etc/inc/smtp.inc
similarity index 100%
rename from etc/inc/smtp.inc
rename to usr/local/etc/inc/smtp.inc
diff --git a/etc/inc/system.inc b/usr/local/etc/inc/system.inc
similarity index 100%
rename from etc/inc/system.inc
rename to usr/local/etc/inc/system.inc
diff --git a/etc/inc/unbound.inc b/usr/local/etc/inc/unbound.inc
similarity index 100%
rename from etc/inc/unbound.inc
rename to usr/local/etc/inc/unbound.inc
diff --git a/etc/inc/upgrade_config.inc b/usr/local/etc/inc/upgrade_config.inc
similarity index 100%
rename from etc/inc/upgrade_config.inc
rename to usr/local/etc/inc/upgrade_config.inc
diff --git a/etc/inc/util.inc b/usr/local/etc/inc/util.inc
similarity index 100%
rename from etc/inc/util.inc
rename to usr/local/etc/inc/util.inc
diff --git a/etc/inc/uuid.php b/usr/local/etc/inc/uuid.php
similarity index 100%
rename from etc/inc/uuid.php
rename to usr/local/etc/inc/uuid.php
diff --git a/etc/inc/voucher.inc b/usr/local/etc/inc/voucher.inc
similarity index 100%
rename from etc/inc/voucher.inc
rename to usr/local/etc/inc/voucher.inc
diff --git a/etc/inc/vpn.inc b/usr/local/etc/inc/vpn.inc
similarity index 100%
rename from etc/inc/vpn.inc
rename to usr/local/etc/inc/vpn.inc
diff --git a/etc/inc/vslb.inc b/usr/local/etc/inc/vslb.inc
similarity index 100%
rename from etc/inc/vslb.inc
rename to usr/local/etc/inc/vslb.inc
diff --git a/etc/inc/wizardapp.inc b/usr/local/etc/inc/wizardapp.inc
similarity index 100%
rename from etc/inc/wizardapp.inc
rename to usr/local/etc/inc/wizardapp.inc
diff --git a/etc/inc/xmlparse.inc b/usr/local/etc/inc/xmlparse.inc
similarity index 100%
rename from etc/inc/xmlparse.inc
rename to usr/local/etc/inc/xmlparse.inc
diff --git a/etc/inc/xmlparse_attr.inc b/usr/local/etc/inc/xmlparse_attr.inc
similarity index 100%
rename from etc/inc/xmlparse_attr.inc
rename to usr/local/etc/inc/xmlparse_attr.inc
diff --git a/etc/inc/xmlreader.inc b/usr/local/etc/inc/xmlreader.inc
similarity index 100%
rename from etc/inc/xmlreader.inc
rename to usr/local/etc/inc/xmlreader.inc
diff --git a/etc/inc/xmlrpc.inc b/usr/local/etc/inc/xmlrpc.inc
similarity index 100%
rename from etc/inc/xmlrpc.inc
rename to usr/local/etc/inc/xmlrpc.inc
diff --git a/etc/inc/xmlrpc_client.inc b/usr/local/etc/inc/xmlrpc_client.inc
similarity index 100%
rename from etc/inc/xmlrpc_client.inc
rename to usr/local/etc/inc/xmlrpc_client.inc
diff --git a/etc/inc/xmlrpc_server.inc b/usr/local/etc/inc/xmlrpc_server.inc
similarity index 100%
rename from etc/inc/xmlrpc_server.inc
rename to usr/local/etc/inc/xmlrpc_server.inc
diff --git a/usr/local/sbin/ovpn_auth_verify b/usr/local/sbin/ovpn_auth_verify
index d9ffb1595..f95de1f39 100755
--- a/usr/local/sbin/ovpn_auth_verify
+++ b/usr/local/sbin/ovpn_auth_verify
@@ -1,11 +1,11 @@
 #!/bin/sh
 
 if [ "$1" = "tls" ]; then
-	RESULT=$(/usr/local/sbin/fcgicli -f /etc/inc/openvpn.tls-verify.php -d "servercn=$2&depth=$3&certdepth=$4&certsubject=$5")
+	RESULT=$(/usr/local/sbin/fcgicli -f /usr/local/etc/inc/openvpn.tls-verify.php -d "servercn=$2&depth=$3&certdepth=$4&certsubject=$5")
 else
 	# Single quoting $password breaks getting the value from the variable.
 	password=$(echo ${password} | /usr/bin/sed 's/&/%26/g')
-	RESULT=$(/usr/local/sbin/fcgicli -f /etc/inc/openvpn.auth-user.php -d "username=$username&password=$password&cn=$common_name&strictcn=$3&authcfg=$2&modeid=$4")
+	RESULT=$(/usr/local/sbin/fcgicli -f /usr/local/etc/inc/openvpn.auth-user.php -d "username=$username&password=$password&cn=$common_name&strictcn=$3&authcfg=$2&modeid=$4")
 fi
 
 if [ "${RESULT}" = "OK" ]; then
diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php
index 1c7120cc5..1fbc5e8b7 100644
--- a/usr/local/www/system_usermanager.php
+++ b/usr/local/www/system_usermanager.php
@@ -340,8 +340,8 @@ if ($_POST['save']) {
 		local_user_set($userent);
 		write_config();
 
-		if(is_dir("/etc/inc/privhooks"))
-			run_plugins("/etc/inc/privhooks");
+		if(is_dir("/usr/local/etc/inc/privhooks"))
+			run_plugins("/usr/local/etc/inc/privhooks");
 
 		conf_mount_ro();
 
@@ -989,4 +989,4 @@ function sshkeyClicked(obj) {
 		</div>
 	</section>
 
-<?php include("foot.inc");?>
\ No newline at end of file
+<?php include("foot.inc");?>
diff --git a/usr/sbin/pc-sysinstall/backend/functions-bsdlabel.sh b/usr/sbin/pc-sysinstall/backend/functions-bsdlabel.sh
index 25dfcc547..eca0870d2 100755
--- a/usr/sbin/pc-sysinstall/backend/functions-bsdlabel.sh
+++ b/usr/sbin/pc-sysinstall/backend/functions-bsdlabel.sh
@@ -123,7 +123,7 @@ gen_glabel_name()
   # Check if we are doing /, and rename it
   if [ "$MOUNT" = "/" ]
   then
-    NAME=`cat /etc/inc/globals.inc | grep product_name | awk '{ print $3 }' | cut -d'"' -f2`
+    NAME=`cat /usr/local/etc/inc/globals.inc | grep product_name | awk '{ print $3 }' | cut -d'"' -f2`
   else
     # If doing a swap partition, also rename it
     if [ "${TYPE}" = "SWAP" ]