From: John Crispin <john@phrozen.org>
Date: Fri, 6 May 2016 19:05:41 +0000 (+0200)
Subject: ubox: make logging code honour the hostname properly
X-Git-Tag: v17.01.0-rc1~2901
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a4571b7631e48e4beea1fe84a09679dfa9f2291a;p=openwrt%2Fstaging%2Fpepe2k.git

ubox: make logging code honour the hostname properly

Signed-off-by: John Crispin <john@phrozen.org>
---

diff --git a/package/system/ubox/files/log.init b/package/system/ubox/files/log.init
index 4fc00d5c23..53c936e246 100644
--- a/package/system/ubox/files/log.init
+++ b/package/system/ubox/files/log.init
@@ -14,6 +14,7 @@ validate_log_section()
 	uci_validate_section system system "${1}" \
 		'log_file:string' \
 		'log_size:uinteger' \
+		'log_hostname:string' \
 		'log_ip:ipaddr' \
 		'log_remote:bool:1' \
 		'log_port:port:514' \
@@ -64,7 +65,7 @@ start_service_remote()
 {
 	PIDCOUNT="$(( ${PIDCOUNT} + 1))"
 	local pid_file="/var/run/logread.${PIDCOUNT}.pid"
-	local log_ip log_port log_proto log_prefix log_remote log_trailer_null
+	local log_ip log_port log_proto log_prefix log_remote log_trailer_null log_hostname
 
 	validate_log_section "${1}" || {
 		echo "validation failed"
@@ -72,9 +73,10 @@ start_service_remote()
 	}
 	[ "${log_remote}" -ne 0 ] || return
 	[ -z "${log_ip}" ] && return
+	[ -z "${log_hostname}" ] && log_hostname=$(cat /proc/sys/kernel/hostname)
 
 	procd_open_instance
-	procd_set_param command "$PROG" -f -r "$log_ip" "${log_port}" -p "$pid_file"
+	procd_set_param command "$PROG" -f -h "$log_hostname" -r "$log_ip" "${log_port}" -p "$pid_file"
 	case "${log_proto}" in
 		"udp") procd_append_param command -u;;
 		"tcp") [ "${log_trailer_null}" -eq 1 ] && procd_append_param command -0;;