1 files changed, 9 insertions, 0 deletions
diff --git a/src/conf_mode/host_name.py b/src/conf_mode/host_name.py
index b0a4648c7..6fb7031a8 100755
--- a/src/conf_mode/host_name.py
+++ b/src/conf_mode/host_name.py
@@ -29,6 +29,8 @@ import subprocess
 import argparse
 import jinja2
 
+import vyos.util
+
 from vyos.config import Config
 from vyos import ConfigError
 
@@ -273,6 +275,13 @@ def apply(config):
 
 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)