components/ntp/patches/40-ntpwait.patch
author Gabriel Carrillo <gabriel.carrillo@oracle.com>
Mon, 25 Nov 2013 14:43:56 -0800
branchs11u1-sru
changeset 2830 3d056f49638d
parent 2795 a8138e69c041
permissions -rw-r--r--
Added tag 0.175.1.13.0.6.0, S11.1SRU13.6 for changeset 663f38ad85e5

This change allows ntp-wait to work with more versions
of NTP, since the format changed slightly. It can be removed
at the next upgrade since there will be no possibility 
of running an older ntp with the old format.

--- scripts/ntp-wait.in
+++ scripts/ntp-wait.in
@@ -20,8 +20,8 @@
     while(<Q>) {
       chomp;
       # the first line should be similar to:
-      # associd=0 status=0645 leap_none, sync_ntp, ...
-      if (/^asso?c?id=0 status=(\S{4}) (\S+), (\S+),/i) {
+      # status=0645 leap_none, sync_ntp, ...
+      if (/status=(\S{4}) (\S+), (\S+),/i) {
 	my $status = $1;
 	my $leap = $2;
 	my $sync = $3;