components/ntp/patches/40-ntpwait.patch
author Gabriel Carrillo <gabriel.carrillo@oracle.com>
Fri, 26 Sep 2014 09:08:52 -0700
branchs11u2-sru-backport
changeset 3348 48f907ef15c8
parent 2789 b28fe4d7df32
permissions -rw-r--r--
ips-buildinfo.mk for S11.2SRU2.8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2789
b28fe4d7df32 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     1
This change allows ntp-wait to work with more versions
b28fe4d7df32 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     2
of NTP, since the format changed slightly. It can be removed
b28fe4d7df32 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     3
at the next upgrade since there will be no possibility 
b28fe4d7df32 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     4
of running an older ntp with the old format.
b28fe4d7df32 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     5
b28fe4d7df32 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     6
--- scripts/ntp-wait.in
b28fe4d7df32 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     7
+++ scripts/ntp-wait.in
b28fe4d7df32 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     8
@@ -20,8 +20,8 @@
b28fe4d7df32 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     9
     while(<Q>) {
b28fe4d7df32 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
    10
       chomp;
b28fe4d7df32 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
    11
       # the first line should be similar to:
b28fe4d7df32 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
    12
-      # associd=0 status=0645 leap_none, sync_ntp, ...
b28fe4d7df32 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
    13
-      if (/^asso?c?id=0 status=(\S{4}) (\S+), (\S+),/i) {
b28fe4d7df32 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
    14
+      # status=0645 leap_none, sync_ntp, ...
b28fe4d7df32 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
    15
+      if (/status=(\S{4}) (\S+), (\S+),/i) {
b28fe4d7df32 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
    16
 	my $status = $1;
b28fe4d7df32 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
    17
 	my $leap = $2;
b28fe4d7df32 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
    18
 	my $sync = $3;