author | Brian Utterback <brian.utterback@oracle.com> |
Fri, 20 Sep 2013 08:55:17 -0700 | |
branch | s11-update |
changeset 2789 | b28fe4d7df32 |
parent 172 | components/ntp/patches/ins-ntp-wait.patch@093198acf7d4 |
permissions | -rw-r--r-- |
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; |