From 338328fa15444d8415b84689839ecb0e68431bf1 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 8 May 2014 09:10:13 -0700
Subject: [PATCH] kernel/v2: hostnames can be one character [GH-3713]

---
 CHANGELOG.md                                  |  4 ++++
 plugins/kernel_v2/config/vm.rb                |  2 +-
 test/unit/plugins/kernel_v2/config/vm_test.rb | 10 ++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0403d49f5..04c812f56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ IMPROVEMENTS:
   - providers/docker: `build_args` config to specify extra args for
       `docker build`. [GH-3684]
 
+BUG FIXES:
+
+  - core: Hostnames can be one character. [GH-3713]
+
 ## 1.6.1 (May 7, 2014)
 
 IMPROVEMENTS:
diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb
index b498a7a4b..bda1b84cc 100644
--- a/plugins/kernel_v2/config/vm.rb
+++ b/plugins/kernel_v2/config/vm.rb
@@ -480,7 +480,7 @@ module VagrantPlugins
         end
 
         errors << I18n.t("vagrant.config.vm.hostname_invalid_characters") if \
-          @hostname && @hostname !~ /^[a-z0-9][-.a-z0-9]+$/i
+          @hostname && @hostname !~ /^[a-z0-9][-.a-z0-9]*$/i
 
         if @box_version
           @box_version.split(",").each do |v|
diff --git a/test/unit/plugins/kernel_v2/config/vm_test.rb b/test/unit/plugins/kernel_v2/config/vm_test.rb
index 7e1ecb883..9c80dadcb 100644
--- a/test/unit/plugins/kernel_v2/config/vm_test.rb
+++ b/test/unit/plugins/kernel_v2/config/vm_test.rb
@@ -134,6 +134,16 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
     end
   end
 
+  describe "#hostname" do
+    ["a", "foo", "foo-bar", "baz0"].each do |valid|
+      it "is valid: #{valid}" do
+        subject.hostname = valid
+        subject.finalize!
+        assert_valid
+      end
+    end
+  end
+
   describe "#network(s)" do
     it "defaults to forwarding SSH" do
       subject.finalize!