From c856f7adfb355b218728a5a7cc60d6fafd9b3b94 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Fri, 22 May 2020 16:33:04 +0200 Subject: [PATCH] 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 --- .../network/config/netifd/files/lib/netifd/dhcp.script | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/network/config/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script index 00604f40e7..6585b641d6 100755 --- 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 + # 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" - [ -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" -- 2.25.1