Merge "Drop strict-order flag from dnsmasq invocation"
This commit is contained in:
commit
ea19589e6d
@ -328,7 +328,6 @@ class Dnsmasq(DhcpLocalProcess):
|
||||
'dnsmasq',
|
||||
'--no-hosts',
|
||||
_no_resolv,
|
||||
'--strict-order',
|
||||
'--except-interface=lo',
|
||||
'--pid-file=%s' % pid_file,
|
||||
'--dhcp-hostsfile=%s' % self.get_conf_file_name('host'),
|
||||
|
@ -1195,7 +1195,6 @@ class TestDnsmasq(TestBase):
|
||||
'dnsmasq',
|
||||
'--no-hosts',
|
||||
no_resolv,
|
||||
'--strict-order',
|
||||
'--except-interface=lo',
|
||||
'--pid-file=%s' % expected_pid_file,
|
||||
'--dhcp-hostsfile=/dhcp/%s/host' % network.id,
|
||||
|
Loading…
Reference in New Issue
Block a user