netifd: replace timesvr with timesrv

/lib/netifd/dhcp.script:
         Keep support for 'timesvr' while also supporting 'timesrv'
         Add log message indicating deprecation of 'timesvr'

Signed-off-by: Sukru Senli <sukru.senli@iopsys.eu>

diff --git a/package/network/config/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script
index 00604f40e70e8ba988bde6af04437d326b5b548a..6585b641d6bfc5aa6acf0dd7237d7a2fadbe5e66 100755 (executable)
--- a/package/network/config/netifd/files/lib/netifd/dhcp.script
+++ b/package/network/config/netifd/files/lib/netifd/dhcp.script
@@ -46,10 +46,16 @@ setup_interface () {
                proto_add_dns_search "$i"
        done
 
                proto_add_dns_search "$i"
        done
 

+       # TODO: Deprecate timesvr in favor of timesrv
+       if [ -n "$timesvr" -a -z "$timesrv" ]; then
+               timesrv="$timesvr"
+               echo "Environment variable 'timesvr' will be deprecated; use 'timesrv' instead."
+       fi
+

        proto_add_data
        [ -n "$ZONE" ]     && json_add_string zone "$ZONE"
        [ -n "$ntpsrv" ]   && json_add_string ntpserver "$ntpsrv"
        proto_add_data
        [ -n "$ZONE" ]     && json_add_string zone "$ZONE"
        [ -n "$ntpsrv" ]   && json_add_string ntpserver "$ntpsrv"

-       [ -n "$timesvr" ]  && json_add_string timeserver "$timesvr"
+       [ -n "$timesrv" ]  && json_add_string timeserver "$timesrv"

        [ -n "$hostname" ] && json_add_string hostname "$hostname"
        [ -n "$message" ]  && json_add_string message "$message"
        [ -n "$timezone" ] && json_add_int timezone "$timezone"
        [ -n "$hostname" ] && json_add_string hostname "$hostname"
        [ -n "$message" ]  && json_add_string message "$message"
        [ -n "$timezone" ] && json_add_int timezone "$timezone"