Rewrites to use config entry 'hostname_file' to allow e.g. Gentoo's way /etc/conf...

diff --git a/inc/classes/main/console/class_ConsoleTools.php b/inc/classes/main/console/class_ConsoleTools.php
index 960aaa42a926fcd412721eb60d6b32560f5a0046..0dd5b93c5778533a085b3ac47a1e7926dda67b1f 100644 (file)
--- a/inc/classes/main/console/class_ConsoleTools.php
+++ b/inc/classes/main/console/class_ConsoleTools.php
@@ -161,7 +161,7 @@ class ConsoleTools extends BaseFrameworkSystem {
 
                try {
                        // Get a file pointer
-                       $io = FrameworkFileInputPointer::createFrameworkFileInputPointer('/etc/hostname');
+                       $io = FrameworkFileInputPointer::createFrameworkFileInputPointer($helperInstance->getConfigEntry('hostname_file'));
 
                        // Read the file
                        $hostname = trim($io->readFromFile());

diff --git a/inc/config.php b/inc/config.php
index a81ea62eb8957ef33fd2adf18e525c727c5874ba..21c027018046a9882f87f32fe8f43029d4aaafdf 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -347,5 +347,8 @@ $cfg->setConfigEntry('proxy_password', '');
 // CFG: PROXY-CONNECT-METHOD
 $cfg->setConfigEntry('proxy_connect_method', 'Y');
 
+// CFG: HOSTNAME-FILE
+$cfg->setConfigEntry('hostname_file', '/etc/hostname');
+
 // [EOF]
 ?>