mirror of
https://github.com/lucaspalomodevelop/opnsense-core.git
synced 2026-03-13 00:07:27 +00:00
Merge branch 'master' of git.opnsense.org:repo/opnsense-core
This commit is contained in:
commit
87e8f0e178
@ -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`);
|
||||
|
||||
@ -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";
|
||||
}
|
||||
|
||||
@ -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";
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user