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

etc/rc.banner

@@ -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`);

usr/local/etc/inc/config.gui.inc

@@ -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";
 }

usr/local/etc/inc/config.inc

@@ -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";
 }

usr/local/etc/rc.cdrom

@@ -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