diff --git a/etc/rc.initial.store_config_to_removable_device b/etc/rc.initial.store_config_to_removable_device deleted file mode 100755 index 19fa70e1e..000000000 --- a/etc/rc.initial.store_config_to_removable_device +++ /dev/null @@ -1,90 +0,0 @@ -#!/usr/local/bin/php -f -. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ - - /* parse the configuration and include all functions used below */ - require_once("config.inc"); - require_once("functions.inc"); - require_once("util.inc"); - - $fp = fopen('php://stdin', 'r'); - - do { - $dirs = array(); - $dirs = return_dir_as_array("/var/db/pfi/"); - if(!is_array($dirs)) { - echo "\nNo capable storage devices detected.\n"; - exit; - } - echo "\nDevices capable of config.xml storage:\n"; - foreach($dirs as $dir) { - preg_match_all("/capable\_(.*)/",$dir,$match_array); - echo $match_array[1][0] . " "; - } - echo "\n\n"; - echo "Enter the device that you wish the"; - echo "\n"; - echo "{$g['product_name']} configuration file to reside on: "; - $move_config_to_device = chop(fgets($fp)); - if ($move_config_to_device == "") { - exit(0); - } - } while (!$move_config_to_device); - - mwexec("/bin/mkdir -p /tmp/mnt/cf"); - - $status = mwexec("/sbin/mount -w -t msdosfs /dev/{$move_config_to_device} /tmp/mnt/cf"); - if(!$status) { - echo "Error while mounting {$move_config_to_device}.\n"; - exit; - } - - echo "\n\nProcessing: "; - $lockkey = lock('config'); - echo "moving..."; - mwexec("mkdir -p /tmp/mnt/cf/conf/"); - mwexec("/bin/mv /cf/conf/config.xml /tmp/mnt/cf/conf/"); - echo "removing old..."; - echo " nullfs... "; - system("/sbin/umount /cf/conf"); - system("/sbin/umount /conf"); - mwexec("/bin/rm -rf /conf/*.*"); - /* use nullfs to mount */ - system("/sbin/mount_nullfs /tmp/mnt/cf/conf /conf"); - system("/sbin/mount_nullfs /tmp/mnt/cf /cf"); - echo "linking..."; - mwexec("/bin/rm -rf /var/db/pfi"); - unlock($lockkey); - echo "done.\n"; - echo "\nYour configuration has been moved to {$move_config_to_device}\n"; - touch("/tmp/config_moved"); - fclose($fp); -?> diff --git a/etc/ca_countries b/usr/local/etc/ca_countries similarity index 100% rename from etc/ca_countries rename to usr/local/etc/ca_countries diff --git a/etc/rc.banner b/usr/local/etc/rc.banner similarity index 99% rename from etc/rc.banner rename to usr/local/etc/rc.banner index 7840cbbc6..d368249fb 100755 --- a/etc/rc.banner +++ b/usr/local/etc/rc.banner @@ -1,9 +1,7 @@ #!/usr/local/bin/php -f . diff --git a/etc/rc.initial.ping b/usr/local/etc/rc.initial.ping similarity index 98% rename from etc/rc.initial.ping rename to usr/local/etc/rc.initial.ping index ff1048774..f17dcdb4a 100755 --- a/etc/rc.initial.ping +++ b/usr/local/etc/rc.initial.ping @@ -1,8 +1,7 @@ #!/usr/local/bin/php -f . diff --git a/etc/rc.initial.reboot b/usr/local/etc/rc.initial.reboot similarity index 98% rename from etc/rc.initial.reboot rename to usr/local/etc/rc.initial.reboot index f3143e0ba..924492baf 100755 --- a/etc/rc.initial.reboot +++ b/usr/local/etc/rc.initial.reboot @@ -1,8 +1,7 @@ #!/usr/local/bin/php -f . diff --git a/etc/rc.initial.setlanip b/usr/local/etc/rc.initial.setlanip similarity index 99% rename from etc/rc.initial.setlanip rename to usr/local/etc/rc.initial.setlanip index 8b3a82014..d3a9a4026 100755 --- a/etc/rc.initial.setlanip +++ b/usr/local/etc/rc.initial.setlanip @@ -1,8 +1,7 @@ #!/usr/local/bin/php -q . @@ -35,7 +34,7 @@ $options = getopt("hn", array("dry-run", "help")); if (isset($options["h"]) || isset($options["help"])) { - echo "usage: /etc/rc.initial.setlanip [option ...]\n"; + echo "usage: rc.initial.setlanip [option ...]\n"; echo " -h, --help show this message\n"; echo " -n, --dry-run do not make any configuration changes\n"; exit(0); @@ -396,7 +395,7 @@ function console_configure_dhcpd($version = 4) { $config[$dhcpd][$interface]['range']['to'] = $dhcpendip; } else { /* TODO - this line is causing a "Fatal error: Cannot unset - string offsets in /etc/rc.initial.setlanip" on below line + string offsets in rc.initial.setlanip" on below line number */ if($config[$dhcpd][$interface]) unset($config[$dhcpd][$interface]['enable']); diff --git a/etc/rc.initial.setports b/usr/local/etc/rc.initial.setports similarity index 98% rename from etc/rc.initial.setports rename to usr/local/etc/rc.initial.setports index aca541934..0c66cc5d5 100755 --- a/etc/rc.initial.setports +++ b/usr/local/etc/rc.initial.setports @@ -1,8 +1,7 @@ #!/usr/local/bin/php -f . @@ -48,4 +47,4 @@ /* reload graphing functions */ enable_rrd_graphing(); -?> \ No newline at end of file +?> diff --git a/etc/rc.initial.toggle_sshd b/usr/local/etc/rc.initial.toggle_sshd similarity index 98% rename from etc/rc.initial.toggle_sshd rename to usr/local/etc/rc.initial.toggle_sshd index 50dd26153..30bda2feb 100755 --- a/etc/rc.initial.toggle_sshd +++ b/usr/local/etc/rc.initial.toggle_sshd @@ -1,4 +1,4 @@ -#! /usr/local/bin/php -f +#!/usr/local/bin/php -f - \ No newline at end of file + diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php index 538718d34..0292619f0 100644 --- a/usr/local/www/system_certmanager.php +++ b/usr/local/www/system_certmanager.php @@ -570,8 +570,8 @@ function internalca_change() { - \ No newline at end of file +