]> xenbits.xensource.com Git - people/iwj/osstest.git/commitdiff
ts-host-install: Expect "pool" in ntp.conf, not only "server"
authorIan Jackson <ian.jackson@eu.citrix.com>
Wed, 4 Jan 2017 18:22:51 +0000 (18:22 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Sun, 22 Jan 2017 23:44:34 +0000 (23:44 +0000)
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>
ts-host-install

index ecf5f0b1f72089c851d058e397fff11367e8e461..99ba130ae7429891ed7a7eb0e51fce9f88d6b7ff 100755 (executable)
@@ -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 {