Merged from Jenner.

2 files changed, 11 insertions, 1 deletions

diff --git a/scripts/rl-system.init b/scripts/rl-system.init
index 4c8c937f..e05e0564 100755
--- a/scripts/rl-system.init
+++ b/scripts/rl-system.init
@@ -154,12 +154,22 @@ set_ipv6_params ()
  done
 }
 
+setup_ntp_config_file () {
+    template_ntp_conf=/opt/vyatta/etc/ntp.conf
+    if [ -e $template_ntp_conf ]; then
+	cp -f $template_ntp_conf /etc/ntp.conf
+    else
+	log_failure_msg "NTP template config file doesn\'t exist"
+    fi
+}
+    
 start () {
     udev_rescan
     create_ssh_host_keys || \
 	log_failure_msg "can't initialize ssh host keys"
     clear_or_override_config_files || \
 	log_failure_msg "can\'t reset config files"
+    setup_ntp_config_file
     add_new_serial_if || \
 	log_failure_msg "can\'t add serial interfaces"
     sysctl -q -p /opt/vyatta/etc/vyatta-sysctl.conf ||
diff --git a/scripts/system/vyatta_update_resolv.pl b/scripts/system/vyatta_update_resolv.pl
index d8e30961..7f2b84b2 100755
--- a/scripts/system/vyatta_update_resolv.pl
+++ b/scripts/system/vyatta_update_resolv.pl
@@ -178,7 +178,7 @@ if ($dhclient_script == 1) {
    }
  if ($restart_ntp == 1) {
      # this corresponds to what is done in name-server/node.def as a fix for bug 1300
-     my $cmd_ntp_restart = "if [ -f /etc/ntp.conf ] && grep -q 'server' /etc/ntp.conf; then /usr/sbin/invoke-rc.d ntp restart >&/dev/null; fi &";
+     my $cmd_ntp_restart = "if [ -f /etc/ntp.conf ] && grep -q '^server' /etc/ntp.conf; then /usr/sbin/invoke-rc.d ntp restart >&/dev/null; fi &";
      system($cmd_ntp_restart);
  }
 }