Merge branch 'master' of git.opnsense.org:repo/opnsense-core

This commit is contained in:
Jos Schellevis 2014-12-09 12:16:01 +00:00
commit 87e8f0e178
4 changed files with 6 additions and 9 deletions

View File

@ -36,8 +36,8 @@
require_once("gwlb.inc");
require_once("interfaces.inc");
$version = trim(file_get_contents("{$g['etc_path']}/version"));
$platform = trim(file_get_contents("{$g['etc_path']}/platform"));
$version = trim(file_get_contents("/usr/local/etc/version"));
$platform = trim(file_get_contents("/usr/local/etc/platform"));
$hostname = $config['system']['hostname'];
$product = $g['product_name'];
$machine = trim(`uname -m`);

View File

@ -62,8 +62,8 @@ else
require_once("crypt.inc");
/* read platform */
if (file_exists("{$g['etc_path']}/platform")) {
$g['platform'] = chop(file_get_contents("{$g['etc_path']}/platform"));
if (file_exists("/usr/local/etc/platform")) {
$g['platform'] = chop(file_get_contents("/usr/local/etc/platform"));
} else {
$g['platform'] = "unknown";
}

View File

@ -74,8 +74,8 @@ require_once("crypt.inc");
/* read platform */
if($g['booting']) echo ".";
if (file_exists("{$g['etc_path']}/platform")) {
$g['platform'] = chop(file_get_contents("{$g['etc_path']}/platform"));
if (file_exists("/usr/local/etc/platform")) {
$g['platform'] = chop(file_get_contents("/usr/local/etc/platform"));
} else {
$g['platform'] = "unknown";
}

View File

@ -6,9 +6,6 @@
# Size of memory file system /conf /home partitions
partsize="6m"
# Run some initialization routines
/etc/rc.d/uzip start
export VARMFS_COPYDBPKG=yes
for i in tmp varmfs etcmfs; do