components/ntp/patches/40-ntpwait.patch
author Brian Utterback <brian.utterback@oracle.com>
Fri, 11 Oct 2013 13:46:59 -0700
branchs11u1-sru
changeset 2795 a8138e69c041
parent 172 components/ntp/patches/ins-ntp-wait.patch@093198acf7d4
permissions -rw-r--r--
15705382 SUNBT7031289 Update ntp to 4.2.7 15722546 SUNBT7055402 ipmp cause reachability issues for ntp4 daemon 15727250 SUNBT7064417 ntpd errors on some new system 15751447 SUNBT7106031 Solaris 11 restrict noserve doesn't work right 15785388 SUNBT7161189 ntpd starts on S 11 in a forked status with error "ntpd indicates n 15813516 SUNBT7195495 ntpd crashed with SIGFPE (Arithmetic Exception) 16090481 ntp version 4 daemon crashes in isc_interfaceiter_first() 16741686 "ntpd" v4.2.5 cannot accept/query interface names longer than 15 characters. 16978017 ntpd debug in Solaris 11.1does not write any output 17000189 NTP needs to increase its file descriptor limit. 17000601 ntpd should log a message when it exits abnormally.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2795
a8138e69c041 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
a8138e69c041 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
a8138e69c041 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 
a8138e69c041 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.
a8138e69c041 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     5
a8138e69c041 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     6
--- scripts/ntp-wait.in
a8138e69c041 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     7
+++ scripts/ntp-wait.in
a8138e69c041 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     8
@@ -20,8 +20,8 @@
a8138e69c041 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
     9
     while(<Q>) {
a8138e69c041 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
    10
       chomp;
a8138e69c041 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:
a8138e69c041 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, ...
a8138e69c041 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) {
a8138e69c041 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, ...
a8138e69c041 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) {
a8138e69c041 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
    16
 	my $status = $1;
a8138e69c041 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
    17
 	my $leap = $2;
a8138e69c041 15705382 SUNBT7031289 Update ntp to 4.2.7
Brian Utterback <brian.utterback@oracle.com>
parents: 172
diff changeset
    18
 	my $sync = $3;