inc: move to new home in /usr/local/etc

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

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

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",

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

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

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

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 ..."

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

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");?>
+<?php include("foot.inc");?>

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" ]