procd: options with default values are not parsed properly in the ubus register code

[lede.git] / package / system / procd / files / log.init

diff --git a/package/system/procd/files/log.init b/package/system/procd/files/log.init
index ce2f1ba2f4863893ed1924812c9c2e9303f9e993..cd7d9965a03301c88c9ac27659223e603f505eed 100644 (file)
--- a/package/system/procd/files/log.init
+++ b/package/system/procd/files/log.init
@@ -6,9 +6,7 @@ START=21
 STOP=89
 
 USE_PROCD=1
-NAME=logread
 PROG=/sbin/logread
-PIDCOUNT=1
 
 start_service_file()
 {
@@ -16,16 +14,14 @@ start_service_file()
        local log_file log_size
 
        config_get log_file $1 log_file
-        config_get log_size $1 log_size
+       config_get log_size $1 log_size
 
        [ -z "${log_file}" ] && return
 
        procd_open_instance
        procd_set_param command "$PROG" -f -F "$log_file" -p "$pid_file"
-        [ -n "${log_size}" ] && procd_append_param command -S "$log_size"
+       [ -n "${log_size}" ] && procd_append_param command -S "$log_size"
        procd_close_instance
-
-       PIDCOUNT="$(( ${PIDCOUNT} + 1))"
 }
 
 start_service_remote()
@@ -35,16 +31,16 @@ start_service_remote()
 
        config_get log_ip $1 log_ip
        config_get log_port $1 log_port
-       config_get log_proto $1 log_proto
+       config_get log_proto $1 log_proto udp
+       config_get log_prefix $1 log_prefix
 
-       [ -z "${log_port}" -o -z "${log_ip}" ] && return
+       [ -z "${log_ip}" ] && return
 
        procd_open_instance
-       procd_set_param command "$PROG" -f -r "$log_ip" "$log_port" -p "$pid_file"
-        [ "${log_proto}" = "udp" ] && procd_append_param command -u
+       procd_set_param command "$PROG" -f -r "$log_ip" "${log_port:-514}" -p "$pid_file"
+       [ "${log_proto}" != "udp" ] || procd_append_param command -u
+       [ -z "${log_prefix}" ] || procd_append_param command -P ${log_prefix}
        procd_close_instance
-
-       PIDCOUNT="$(( ${PIDCOUNT} + 1))"
 }
 
 service_triggers()