From 6697df651921d00e6799a3094b22d04bab09aa46 Mon Sep 17 00:00:00 2001 From: Lukas Macura Date: Mon, 28 Nov 2016 15:54:08 +0100 Subject: [PATCH] More environment checking before autodetection for offline install --- install.sh | 9 +++++---- lib/os.lib.sh | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/install.sh b/install.sh index d3ac30d..2601354 100755 --- a/install.sh +++ b/install.sh @@ -221,7 +221,7 @@ zaf_configure_server() { zaf_preconfigure(){ - zaf_detect_system + [ -z "$ZAF_OS" ] && zaf_detect_system zaf_os_specific zaf_preconfigure_os if ! zaf_is_root; then [ -z "$INSTALL_PREFIX" ] && zaf_err "We are not root. Use INSTALL_PREFIX or become root." @@ -518,9 +518,10 @@ install) echo " To unset Agent-Option use Z_Option=''" echo echo "Example 1 (default install): install.sh auto" - echo 'Example 2 (preconfigure agent options): install.sh auto A_Server=zabbix.server A_ServerActive=zabbix.server A_Hostname=$(hostname)' - echo "Example 3 (preconfigure zaf packaging system to use): install.sh auto ZAF_PKG=opkg" - echo "Example 4 (interactive): install.sh interactive" + echo 'Example 2 (preconfigure agent options): install.sh auto Z_Server=zabbix.server Z_ServerActive=zabbix.server Z_Hostname=$(hostname)' + echo 'Example 3 (preconfigure server options): install.sh auto S_StartPollers=10 S_ListenPort=10051' + echo "Example 4 (preconfigure zaf packaging system to use): install.sh auto ZAF_PKG=opkg" + echo "Example 5 (interactive): install.sh interactive" echo exit 1 esac diff --git a/lib/os.lib.sh b/lib/os.lib.sh index 7457ce2..bde51ba 100644 --- a/lib/os.lib.sh +++ b/lib/os.lib.sh @@ -1,7 +1,7 @@ # Os related functions zaf_preconfigure_os_openwrt() { - ZAF_AGENT_RESTART="zaf agent-config ; /etc/init.d/zabbix_agentd restart" + ZAF_AGENT_RESTART="/etc/init.d/zabbix_agentd restart" ZAF_AGENT_CONFIGD="/var/run/zabbix_agentd.conf.d/" ZAF_AGENT_CONFIG="/etc/zabbix_agentd.conf" ZAF_AGENT_PKG="zabbix-agentd"