ntp: Build new_ntp_servers without superfluous spaces

Fixes #582.

diff --git a/hooks/50-ntp.conf b/hooks/50-ntp.conf
index cbaa374408bb497f158389f1072c689687544466..c6b36933cce4f752da5f41c52b57811829397055 100644 (file)
--- a/hooks/50-ntp.conf
+++ b/hooks/50-ntp.conf
@@ -131,7 +131,9 @@ remove_ntp_conf()
 # For ease of use, map DHCP6 names onto our DHCP4 names
 case "$reason" in
 BOUND6|RENEW6|REBIND6|REBOOT6|INFORM6)
-       new_ntp_servers="$new_dhcp6_sntp_servers $new_dhcp6_ntp_server_addr $new_dhcp6_ntp_server_fqdn"
+       new_ntp_servers="$new_dhcp6_sntp_servers"
+       new_ntp_servers="$new_ntp_servers${new_ntp_servers:+ }$new_dhcp6_ntp_server_addr"
+       new_ntp_servers="$new_ntp_servers${new_ntp_servers:+ }$new_dhcp6_ntp_server_fqdn"
 ;;
 esac
 

diff --git a/hooks/50-timesyncd.conf b/hooks/50-timesyncd.conf
index 8ee722bda4e4b5b03d9f632ab25e324ffa2d51d9..f213bd8c495c1ad133da089e7a55390a9fe06ea5 100644 (file)
--- a/hooks/50-timesyncd.conf
+++ b/hooks/50-timesyncd.conf
@@ -54,7 +54,9 @@ add_timesyncd_conf()
 # For ease of use, map DHCP6 names onto our DHCP4 names
 case "$reason" in
 BOUND6|RENEW6|REBIND6|REBOOT6|INFORM6)
-       new_ntp_servers="$new_dhcp6_sntp_servers $new_dhcp6_ntp_server_addr $new_dhcp6_ntp_server_fqdn"
+       new_ntp_servers="$new_dhcp6_sntp_servers"
+       new_ntp_servers="$new_ntp_servers${new_ntp_servers:+ }$new_dhcp6_ntp_server_addr"
+       new_ntp_servers="$new_ntp_servers${new_ntp_servers:+ }$new_dhcp6_ntp_server_fqdn"
 ;;
 esac