From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Wed, 4 Jan 2017 18:22:51 +0000 (+0000)
Subject: ts-host-install: Expect "pool" in ntp.conf, not only "server"
X-Git-Tag: openstack-v11~156
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e63626d7604cda53f99e494fcdb19f03996e65e8;p=people%2Faperard%2Fosstest.git

ts-host-install: Expect "pool" in ntp.conf, not only "server"

This is helpful for playing around with stretch, which seems to use
this option by default.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/ts-host-install b/ts-host-install
index ecf5f0b1..99ba130a 100755
--- a/ts-host-install
+++ b/ts-host-install
@@ -134,7 +134,7 @@ END
 	target_editfile_root($ho, '/etc/ntp.conf', sub {
 	    my $done= 0;
 	    while (<EI>) {
-		if (m/^server\s/) {
+		if (m/^server\b|^pool\b\s/) {
 		    if ($ho->{Suite} =~ m/lenny|squeeze|wheezy|jessie/) {
 			$_= $done ? "" : "server $ntpserver\n";
 		    } else {