Skip to content

O
OpnSense
Commit 2a6bb6db authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

etc: move more files, fix breakage along the way

parent bbec3a8f
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 24 deletions
etc/phpshellsessions/gitsync
View file @ 2a6bb6db
...@@ -385,9 +385,9 @@ function post_cvssync_commands() { ...@@ -385,9 +385,9 @@ function post_cvssync_commands() {
exec("pfctl -f /tmp/rules.debug"); exec("pfctl -f /tmp/rules.debug");
echo "\n"; echo "\n";
if(file_exists("/etc/rc.php_ini_setup")) { if(file_exists("/usr/local/etc/rc.php_ini_setup")) {
echo "===> Running /etc/rc.php_ini_setup..."; echo "===> Running rc.php_ini_setup...";
exec("/etc/rc.php_ini_setup"); exec("/usr/local/etc/rc.php_ini_setup");
echo "\n"; echo "\n";
} }
......
etc/rc
View file @ 2a6bb6db
...@@ -65,7 +65,7 @@ if [ "$PLATFORM" = "pfSense" ]; then ...@@ -65,7 +65,7 @@ if [ "$PLATFORM" = "pfSense" ]; then
fi fi
if [ "${PLATFORM}" = "cdrom" ]; then if [ "${PLATFORM}" = "cdrom" ]; then
/etc/rc.cdrom /usr/local/etc/rc.cdrom
else else
# Mount /. If it fails run a fsck. # Mount /. If it fails run a fsck.
if [ "$PLATFORM" = "nanobsd" ]; then if [ "$PLATFORM" = "nanobsd" ]; then
...@@ -379,7 +379,7 @@ echo "done." ...@@ -379,7 +379,7 @@ echo "done."
# Run the php.ini setup file and populate # Run the php.ini setup file and populate
# /usr/local/etc/php.ini and /usr/local/lib/php.ini # /usr/local/etc/php.ini and /usr/local/lib/php.ini
/etc/rc.php_ini_setup 2>/tmp/php_errors.txt /usr/local/etc/rc.php_ini_setup 2>/tmp/php_errors.txt
# Launch external configuration loader for supported platforms # Launch external configuration loader for supported platforms
if [ "$PLATFORM" = "nanobsd" ]; then if [ "$PLATFORM" = "nanobsd" ]; then
...@@ -406,10 +406,9 @@ echo -n "Launching the init system..." ...@@ -406,10 +406,9 @@ echo -n "Launching the init system..."
/bin/rm -f /cf/conf/backup/backup.cache /bin/rm -f /cf/conf/backup/backup.cache
/bin/rm -f /root/lighttpd* /bin/rm -f /root/lighttpd*
/usr/bin/touch $varrunpath/booting /usr/bin/touch $varrunpath/booting
/etc/rc.bootup /usr/local/etc/rc.bootup
# /etc/rc.bootup unset $g['booting'], remove file right now to be # rc.bootup unset $g['booting'], remove file right now to be consistent
# consistent
/bin/rm $varrunpath/booting /bin/rm $varrunpath/booting
# If a shell was selected from recovery # If a shell was selected from recovery
......
etc/rc.reboot
View file @ 2a6bb6db
#!/bin/sh #!/bin/sh
# $Id$
if ! /usr/bin/lockf -s -t 30 /tmp/config.lock /usr/bin/true; then if ! /usr/bin/lockf -s -t 30 /tmp/config.lock /usr/bin/true; then
echo "Cannot reboot at this moment, a config write operation is in progress, and 30 seconds have passed." echo "Cannot reboot at this moment, a config write operation is in progress, and 30 seconds have passed."
exit 1 exit 1
...@@ -21,8 +19,8 @@ DISK_NAME=`/bin/df /var/db/rrd | /usr/bin/tail -1 | /usr/bin/awk '{print $1;}'` ...@@ -21,8 +19,8 @@ DISK_NAME=`/bin/df /var/db/rrd | /usr/bin/tail -1 | /usr/bin/awk '{print $1;}'`
DISK_TYPE=`/usr/bin/basename ${DISK_NAME} | /usr/bin/cut -c1-2` DISK_TYPE=`/usr/bin/basename ${DISK_NAME} | /usr/bin/cut -c1-2`
# If we are not on a full install, or if the full install wants RAM disks, or if the full install _was_ using RAM disks, but isn't for the next boot... # If we are not on a full install, or if the full install wants RAM disks, or if the full install _was_ using RAM disks, but isn't for the next boot...
if [ "${PLATFORM}" != "pfSense" ] || [ ${USE_MFS_TMPVAR} -gt 0 ] || [ "${DISK_TYPE}" = "md" ]; then if [ "${PLATFORM}" != "pfSense" ] || [ ${USE_MFS_TMPVAR} -gt 0 ] || [ "${DISK_TYPE}" = "md" ]; then
/etc/rc.backup_rrd.sh /usr/local/etc/rc.backup_rrd.sh
/etc/rc.backup_dhcpleases.sh /usr/local/etc/rc.backup_dhcpleases.sh
fi fi
sleep 1 sleep 1
......
etc/rc.shutdown
View file @ 2a6bb6db
...@@ -32,6 +32,6 @@ DISK_NAME=`/bin/df /var/db/rrd | /usr/bin/tail -1 | /usr/bin/awk '{print $1;}'` ...@@ -32,6 +32,6 @@ DISK_NAME=`/bin/df /var/db/rrd | /usr/bin/tail -1 | /usr/bin/awk '{print $1;}'`
DISK_TYPE=`/usr/bin/basename ${DISK_NAME} | /usr/bin/cut -c1-2` DISK_TYPE=`/usr/bin/basename ${DISK_NAME} | /usr/bin/cut -c1-2`
# If we are not on a full install, or if the full install wants RAM disks, or if the full install _was_ using RAM disks, but isn't for the next boot... # If we are not on a full install, or if the full install wants RAM disks, or if the full install _was_ using RAM disks, but isn't for the next boot...
if [ "${PLATFORM}" != "pfSense" ] || [ ${USE_MFS_TMPVAR} -gt 0 ] || [ "${DISK_TYPE}" = "md" ]; then if [ "${PLATFORM}" != "pfSense" ] || [ ${USE_MFS_TMPVAR} -gt 0 ] || [ "${DISK_TYPE}" = "md" ]; then
/etc/rc.backup_rrd.sh /usr/local/etc/rc.backup_rrd.sh
/etc/rc.backup_dhcpleases.sh /usr/local/etc/rc.backup_dhcpleases.sh
fi fi
usr/local/etc/inc/upgrade_config.inc
View file @ 2a6bb6db
...@@ -2109,7 +2109,7 @@ function upgrade_054_to_055() { ...@@ -2109,7 +2109,7 @@ function upgrade_054_to_055() {
enable_rrd_graphing(); enable_rrd_graphing();
/* Let's save the RRD graphs after we run enable RRD graphing */ /* Let's save the RRD graphs after we run enable RRD graphing */
/* The function will restore the rrd.tgz so we will save it after */ /* The function will restore the rrd.tgz so we will save it after */
exec("cd /; LANG=C NO_REMOUNT=1 RRDDBPATH='{$rrddbpath}' CF_CONF_PATH='{$g['cf_conf_path']}' /etc/rc.backup_rrd.sh"); exec("cd /; LANG=C NO_REMOUNT=1 RRDDBPATH='{$rrddbpath}' CF_CONF_PATH='{$g['cf_conf_path']}' /usr/local/etc/rc.backup_rrd.sh");
unlink_if_exists("{$g['vardb_path']}/rrd/*.xml"); unlink_if_exists("{$g['vardb_path']}/rrd/*.xml");
if ($g['booting']) if ($g['booting'])
echo "Updating configuration..."; echo "Updating configuration...";
...@@ -2791,7 +2791,7 @@ function upgrade_080_to_081() { ...@@ -2791,7 +2791,7 @@ function upgrade_080_to_081() {
enable_rrd_graphing(); enable_rrd_graphing();
/* Let's save the RRD graphs after we run enable RRD graphing */ /* Let's save the RRD graphs after we run enable RRD graphing */
/* The function will restore the rrd.tgz so we will save it after */ /* The function will restore the rrd.tgz so we will save it after */
exec("cd /; LANG=C NO_REMOUNT=1 RRDDBPATH='{$rrddbpath}' CF_CONF_PATH='{$g['cf_conf_path']}' /etc/rc.backup_rrd.sh"); exec("cd /; LANG=C NO_REMOUNT=1 RRDDBPATH='{$rrddbpath}' CF_CONF_PATH='{$g['cf_conf_path']}' /usr/local/etc/rc.backup_rrd.sh");
if ($g['booting']) if ($g['booting'])
echo "Updating configuration..."; echo "Updating configuration...";
foreach($config['filter']['rule'] as & $rule) { foreach($config['filter']['rule'] as & $rule) {
...@@ -3127,7 +3127,7 @@ function upgrade_095_to_096() { ...@@ -3127,7 +3127,7 @@ function upgrade_095_to_096() {
enable_rrd_graphing(); enable_rrd_graphing();
/* Let's save the RRD graphs after we run enable RRD graphing */ /* Let's save the RRD graphs after we run enable RRD graphing */
/* The function will restore the rrd.tgz so we will save it after */ /* The function will restore the rrd.tgz so we will save it after */
exec("cd /; LANG=C NO_REMOUNT=1 RRDDBPATH='{$rrddbpath}' CF_CONF_PATH='{$g['cf_conf_path']}' /etc/rc.backup_rrd.sh"); exec("cd /; LANG=C NO_REMOUNT=1 RRDDBPATH='{$rrddbpath}' CF_CONF_PATH='{$g['cf_conf_path']}' /usr/local/etc/rc.backup_rrd.sh");
} }
function upgrade_096_to_097() { function upgrade_096_to_097() {
......
etc/rc.bootup → usr/local/etc/rc.bootup
View file @ 2a6bb6db
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<?php <?php
/* /*
rc.bootup
part of pfSense by Scott Ullrich part of pfSense by Scott Ullrich
originally based on m0n0wall (http://m0n0.ch/wall) originally based on m0n0wall (http://m0n0.ch/wall)
Copyright (C) 2004-2009 Scott Ullrich <sullrich@pfsense.org>. Copyright (C) 2004-2009 Scott Ullrich <sullrich@pfsense.org>.
......
etc/rc.php_ini_setup → usr/local/etc/rc.php_ini_setup
View file @ 2a6bb6db
#!/bin/sh #!/bin/sh
# #
# rc.php_ini_setup
# Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com> # Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>
# All rights reserved. # All rights reserved.
# #
...@@ -111,7 +110,7 @@ TIMEZONE=`cat /conf/config.xml | egrep -E '<timezone>(.*?)</timezone>' | awk -F' ...@@ -111,7 +110,7 @@ TIMEZONE=`cat /conf/config.xml | egrep -E '<timezone>(.*?)</timezone>' | awk -F'
# the file being clobbered and the firewall # the file being clobbered and the firewall
# not being able to boot back up. # not being able to boot back up.
/bin/cat >/usr/local/lib/php.ini <<EOF /bin/cat >/usr/local/lib/php.ini <<EOF
; File generated from /etc/rc.php_ini_setup ; File generated via rc.php_ini_setup
output_buffering = "0" output_buffering = "0"
expose_php = Off expose_php = Off
implicit_flush = true implicit_flush = true
......
usr/local/sbin/ppp-linkdown
View file @ 2a6bb6db
...@@ -8,7 +8,7 @@ if [ -f /tmp/${IF}up ] && [ -f /conf/${IF}.log ]; then ...@@ -8,7 +8,7 @@ if [ -f /tmp/${IF}up ] && [ -f /conf/${IF}.log ]; then
/usr/local/sbin/ppp-log-uptime.sh $seconds ${IF} & /usr/local/sbin/ppp-log-uptime.sh $seconds ${IF} &
fi fi
/etc/rc.kill_states ${IF} ${LOCAL_IP} /usr/local/etc/rc.kill_states ${IF} ${LOCAL_IP}
if [ -s "/tmp/${IF}_defaultgw" ]; then if [ -s "/tmp/${IF}_defaultgw" ]; then
GW=`head -n 1 /tmp/${IF}_defaultgw` GW=`head -n 1 /tmp/${IF}_defaultgw`
......
usr/local/www/system_advanced_misc.php
View file @ 2a6bb6db
...@@ -210,11 +210,11 @@ if ($_POST) { ...@@ -210,11 +210,11 @@ if ($_POST) {
if (isset($_POST['rrdbackup'])) { if (isset($_POST['rrdbackup'])) {
$config['system']['rrdbackup'] = $_POST['rrdbackup']; $config['system']['rrdbackup'] = $_POST['rrdbackup'];
install_cron_job("/etc/rc.backup_rrd.sh", ($config['system']['rrdbackup'] > 0), $minute="0", "*/{$config['system']['rrdbackup']}"); install_cron_job("/usr/local/etc/rc.backup_rrd.sh", ($config['system']['rrdbackup'] > 0), $minute="0", "*/{$config['system']['rrdbackup']}");
} }
if (isset($_POST['dhcpbackup'])) { if (isset($_POST['dhcpbackup'])) {
$config['system']['dhcpbackup'] = $_POST['dhcpbackup']; $config['system']['dhcpbackup'] = $_POST['dhcpbackup'];
install_cron_job("/etc/rc.backup_dhcpleases.sh", ($config['system']['dhcpbackup'] > 0), $minute="0", "*/{$config['system']['dhcpbackup']}"); install_cron_job("/usr/local/etc/rc.backup_dhcpleases.sh", ($config['system']['dhcpbackup'] > 0), $minute="0", "*/{$config['system']['dhcpbackup']}");
} }
write_config(); write_config();
...@@ -699,4 +699,4 @@ include("head.inc"); ...@@ -699,4 +699,4 @@ include("head.inc");
</div> </div>
</section> </section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023