T1504: wait for commit lock before trying to update resolv.conf in the out of CLI mode.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/conf_mode/dns_forwarding.py b/src/conf_mode/dns_forwarding.py
index 7559a0af6..491bb0120 100755
--- a/src/conf_mode/dns_forwarding.py
+++ b/src/conf_mode/dns_forwarding.py
@@ -23,6 +23,8 @@ import argparse
 import jinja2
 import netifaces
 
+import vyos.util
+
 from vyos.config import Config
 from vyos import ConfigError
 
@@ -265,6 +267,12 @@ def apply(dns):
 
 if __name__ == '__main__':
     args = parser.parse_args()
+
+    if args.dhclient:
+        # There's a big chance it was triggered by a commit still in progress
+        # so we need to wait until the new values are in the running config
+        vyos.util.wait_for_commit_lock()
+
     try:
         c = get_config(args)
         verify(c)