Merge pull request #2699 from freenas/issues/dns_resolv

tkt-78232: Remove all usages of ix-resolv
truenas · Mar 4, 2019 · 9e508a1 · 9e508a1
2 parents 2a03a72 + 8cb168a
commit 9e508a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/freenas/etc/directoryservice/DomainController/ctl b/src/freenas/etc/directoryservice/DomainController/ctl
@@ -127,7 +127,7 @@ dcctl_start()
 	echo ${cifs_started} > "${cifs_file}"
 
 	dcctl_cmd ${service} ix-kerberos quietstart
-	dcctl_cmd ${service} ix-resolv quietstart
+	dcctl_cmd ${python} ${notifier} call dns.sync
 	dcctl_cmd ${service} ix-nsswitch quietstart
 	dcctl_cmd ${service} ix-pam quietstart
 
@@ -192,7 +192,7 @@ dcctl_stop()
 	fi
 
 	domaincontroller_set 0
-	dcctl_cmd ${service} ix-resolv quietstart
+	dcctl_cmd ${python} ${notifier} call dns.sync
 
 	return 0
 }

diff --git a/src/middlewared/middlewared/plugins/service.py b/src/middlewared/middlewared/plugins/service.py
@@ -506,7 +506,7 @@ async def _reload_hostname(self, **kwargs):
 
     async def _reload_resolvconf(self, **kwargs):
         await self._reload_hostname()
-        await self._service("ix-resolv", "start", quiet=True, **kwargs)
+        await self.middleware.call('dns.sync')
 
     async def _reload_networkgeneral(self, **kwargs):
         await self._reload_resolvconf()