etc: move more files

etc/phpshellsessions/externalconfiglocator

-
-include("/etc/ecl.php");
-
+include("/usr/local/etc/ecl.php");

etc/rc.restore_full_backup

 #!/bin/sh
 
 echo -n "Checking..."
-if [ `tar tzPf $1 /etc/rc 2>/dev/null` ]; then
+if [ `tar tzPf $1 /usr/local/etc/rc 2>/dev/null` ]; then
 	echo " Backup file looks OK."
 	echo "One moment, restoring ${1}..."
 	if [ -f /tmp/do_not_restore_config.xml ]; then

etc/rc → usr/local/etc/rc

 #!/bin/sh
 
-# /etc/rc - master bootup script, invokes php setup
 # part of pfSense by Scott Ullrich
 # Copyright (C) 2004-2010 Scott Ullrich, All rights reserved.
 # originally based on m0n0wall (http://neon1.net/m0n0wall)
@@ -122,7 +121,7 @@ else
 
 	USE_MFS_TMPVAR=`/usr/bin/grep -c use_mfs_tmpvar /cf/conf/config.xml`
 	if [ "${PLATFORM}" = "nanobsd" ] || [ ${USE_MFS_TMPVAR} -gt 0 ]; then
-		/etc/rc.embedded
+		/usr/local/etc/rc.embedded
 	fi
 fi
 
@@ -377,19 +376,8 @@ echo "done."
 /usr/local/etc/rc.php_ini_setup 2>/tmp/php_errors.txt
 
 # Launch external configuration loader for supported platforms
-if [ "$PLATFORM" = "nanobsd" ]; then
-	/usr/local/bin/php -q /etc/ecl.php
-fi
-
-# Launch external configuration loader for supported platforms
-if [ "$PLATFORM" = "pfSense" ]; then
-	/usr/local/bin/php -q /etc/ecl.php
-fi
-
-if [ -f /etc/rc.custom_boot_early ]; then
-	/bin/echo -n "Launching /etc/rc.custom_boot_early...";
-	/etc/rc.custom_boot_early
-	echo "Done"
+if [ "$PLATFORM" = "nanobsd" -o "$PLATFORM" = "pfSense" ]; then
+	/usr/local/bin/php -q /usr/local/etc/ecl.php
 fi
 
 chmod u+rx  /usr/local/opnsense/check_reload_status.py

etc/rc.embedded → usr/local/etc/rc.embedded

 #!/bin/sh
 #
-# rc.embedded - embedded system specific startup information
-# For pfSense
-
 # Size of /tmp
 USE_MFS_TMP_SIZE=`/usr/bin/grep use_mfs_tmp_size /cf/conf/config.xml | /usr/bin/cut -f2 -d'>' | /usr/bin/cut -f1 -d'<'`
 if [ ! -z ${USE_MFS_TMP_SIZE} ] && [ ${USE_MFS_TMP_SIZE} -gt 0 ]; then
@@ -19,9 +16,6 @@ else
 	varsize="60m"
 fi
 
-# Run some initialization routines
-[ -f /etc/rc.d/uzip ] && /etc/rc.d/uzip start
-
 echo -n "Setting up memory disks..."
 mdmfs -S -M -s ${tmpsize} md /tmp
 mdmfs -S -M -s ${varsize} md /var

usr/local/etc/rc.initial

@@ -119,7 +119,7 @@ case ${opmode} in
 	/usr/sbin/tcpdump -s 256 -v -S -l -n -e -ttt -i pflog0
 	;;
 11)
-	/etc/rc.restart_webgui
+	/usr/local/etc/rc.restart_webgui
 	;;
 12)
 	/usr/local/sbin/pfSsh.php

usr/local/etc/rc.initial.setlanip

@@ -471,7 +471,7 @@ if (!$dry_run) {
 	}
 	if($restart_webgui) {
 		echo " restarting webConfigurator... ";
-		mwexec("/etc/rc.restart_webgui");
+		mwexec("/usr/local/etc/rc.restart_webgui");
 	}
 }
 	

etc/rc.reload_all → usr/local/etc/rc.reload_all

 #!/usr/local/bin/php -f
 <?php
-/* $Id$ */
+
 /*
-    rc.reload_all
     part of pfSense (https://www.pfsense.org)
     Copyright (C) 2004 Scott Ullrich
     All rights reserved.
@@ -42,5 +41,3 @@ reload_all_sync();
 sleep(2);
 log_error("rc.reload_all: Reloading filter configuration.");
 filter_configure_sync();
-
-?>

etc/rc.reload_interfaces → usr/local/etc/rc.reload_interfaces

 #!/usr/local/bin/php -f
 <?php
-/* $Id$ */
+
 /*
-    rc.reload_interfaces
     part of pfSense (https://www.pfsense.org)
     Copyright (C) 2004 Scott Ullrich
     All rights reserved.
@@ -41,5 +40,3 @@ reload_interfaces_sync();
 filter_configure_sync();
 /* XXX: needs fixing */
 //ovpn_config_server("pfreload");
-
-?>

usr/local/opnsense/conf/actions_interface.conf

@@ -11,7 +11,7 @@ type:script
 message:Linkup stopping %s
 
 [all.reload]
-command:/etc/rc.reload_interfaces
+command:/usr/local/etc/rc.reload_interfaces
 parameters:
 type:script
 message:Reloading interfaces
@@ -47,13 +47,13 @@ type:script
 message:Reloading filter_configure_xmlrpc
 
 [carpmaster]
-command:/etc/rc.carpmaster
+command:/usr/local/etc/rc.carpmaster
 parameters:%s
 type:script
 message:Carp master event
 
 [carpbackup]
-command:/etc/rc.carpbackup
+command:/usr/local/etc/rc.carpbackup
 parameters:%s
 type:script
 message:Carp backup event

usr/local/opnsense/conf/actions_service.conf

 [reload|restart.all]
-command:/etc/rc.reload_all
+command:/usr/local/etc/rc.reload_all
 parameters:
 type:script
 message:Reloading all
@@ -60,7 +60,7 @@ type:script
 message:starting sshd
 
 [reload|restart.webgui]
-command:/etc/rc.restart_webgui
+command:/usr/local/etc/rc.restart_webgui
 parameters:
 type:script
 message:webConfigurator restart in progress