From 0aaa2cc147873607ecdcbc822087416dd21ee056 Mon Sep 17 00:00:00 2001
From: Brian Cain <bcain@hashicorp.com>
Date: Mon, 4 Nov 2019 08:41:51 -0800
Subject: [PATCH] Fixes #11173: Show guest name in hostname erorr message

This commit adds the machine guest name in the hostname validation error
message so that it's easier to see which guest in a Vagrantfile has the
validation error.
---
 plugins/kernel_v2/config/vm.rb | 2 +-
 templates/locales/en.yml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb
index 6339d3e4b..b80bda8ca 100644
--- a/plugins/kernel_v2/config/vm.rb
+++ b/plugins/kernel_v2/config/vm.rb
@@ -609,7 +609,7 @@ module VagrantPlugins
           errors << I18n.t("vagrant.config.vm.clone_and_box")
         end
 
-        errors << I18n.t("vagrant.config.vm.hostname_invalid_characters") if \
+        errors << I18n.t("vagrant.config.vm.hostname_invalid_characters", name: machine.name) if \
           @hostname && @hostname !~ /^[a-z0-9][-.a-z0-9]*$/i
 
         if @box_version
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index b72176ab6..0339cf220 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1888,7 +1888,7 @@ en:
         box_missing: "A box must be specified."
         clone_and_box: "Only one of clone or box can be specified."
         hostname_invalid_characters: |-
-          The hostname set for the VM should only contain letters, numbers,
+          The hostname set for the VM '%{name}' should only contain letters, numbers,
           hyphens or dots. It cannot start with a hyphen or dot.
         ignore_provider_config: |-
           Ignoring provider config for validation...