diff --git a/etc/rc.banner b/etc/rc.banner index 901286f8c..7840cbbc6 100755 --- a/etc/rc.banner +++ b/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`); diff --git a/usr/local/etc/inc/config.gui.inc b/usr/local/etc/inc/config.gui.inc index 3eec79515..0ff273c02 100644 --- a/usr/local/etc/inc/config.gui.inc +++ b/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"; } diff --git a/usr/local/etc/inc/config.inc b/usr/local/etc/inc/config.inc index 161935eba..715ffbbe9 100644 --- a/usr/local/etc/inc/config.inc +++ b/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"; } diff --git a/usr/local/etc/rc.cdrom b/usr/local/etc/rc.cdrom index 2018fe9ee..d17fc7357 100755 --- a/usr/local/etc/rc.cdrom +++ b/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