diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2004-12-12 01:44:44 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2004-12-12 01:44:44 +0000 |
commit | ee11cc6eaea213214d6f632dde3ff878edab55da (patch) | |
tree | 02dc9c2a3ee819dcacdd5b2c0717108d8f786737 /etc | |
parent | d03efa9c8b1b6479e92969c684463c802dba741c (diff) | |
download | pfsense-ee11cc6eaea213214d6f632dde3ff878edab55da.zip pfsense-ee11cc6eaea213214d6f632dde3ff878edab55da.tar.gz |
Say welcome to the pfSense package manager!
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/config.inc | 11 | ||||
-rw-r--r-- | etc/inc/globals.inc | 17 |
2 files changed, 16 insertions, 12 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 1bc8c16..01a5e19 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -85,7 +85,7 @@ if ($g['booting']) { ******************************************************************************* * FATAL ERROR * * The device that contains the configuration file (config.xml) could not be * -* found. m0n0wall cannot continue booting. * +* found. pfSense cannot continue booting. * ******************************************************************************* @@ -126,6 +126,7 @@ if (!$noparseconfig) { /* read cache */ $config = unserialize(file_get_contents("{$g['tmp_path']}/config.cache")); + } else { if (!file_exists("{$g['conf_path']}/config.xml")) { @@ -139,7 +140,7 @@ if (!$noparseconfig) { echo "file is inserted. If it isn't, your configuration changes will be lost\n"; echo "on reboot.\n"; } else { - echo "XML configuration file not found. m0n0wall cannot continue booting.\n"; + echo "XML configuration file not found. pfSense cannot continue booting.\n"; mwexec("/sbin/halt"); exit; } @@ -158,9 +159,9 @@ if (!$noparseconfig) { ******************************************************************************* * WARNING! * -* The current configuration has been created with a newer version of m0n0wall * +* The current configuration has been created with a newer version of pfSense * * than this one! This can lead to serious misbehavior and even security * -* holes! You are urged to either upgrade to a newer version of m0n0wall or * +* holes! You are urged to either upgrade to a newer version of pfSense or * * revert to the default configuration immediately! * ******************************************************************************* @@ -203,7 +204,7 @@ function conf_mount_ro() { /* convert configuration, if necessary */ function convert_config() { - global $config, $g; + global $config, $pkg_config, $g; if ($config['version'] == $g['latest_config']) return; /* already at latest version */ diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index eef6cff..e278f12 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -1,21 +1,23 @@ <?php /* globals.inc - part of m0n0wall (http://m0n0.ch/wall) - + part of pfSense (www.pfsense.com) + Copyright (C) 2004 Scott Ullrich + + Originally Part of m0n0wall Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. 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 @@ -43,10 +45,11 @@ $g = array( "www_path" => "/usr/local/www", "captiveportal_path" => "/usr/local/captiveportal", "xml_rootobj" => "m0n0wall", + "xml_pkg_rootobj" => "pfSense_pkgs", "pppoe_interface" => "ng0", "n_pptp_units" => 16, "pptp_subnet" => 28, - "debug" => false, + "debug" => true, "latest_config" => "1.4", "nopccard_platforms" => array("wrap", "net48xx") ); |