haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

guests/debian: don't return from block [GH-3283]

This commit is contained in:
Mitchell Hashimoto 2014-03-20 17:52:31 -07:00
parent bfaa4c7c9c
commit 9fc5540841
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@ BUG FIXES:
- core: Vagrant won't collide with newer versions of Bundler [GH-3193] - core: Vagrant won't collide with newer versions of Bundler [GH-3193]
- core: Allow provisioner plugins to not have a config class. [GH-3272] - core: Allow provisioner plugins to not have a config class. [GH-3272]
- commands/status: Machine readable output contains the target. [GH-3218] - commands/status: Machine readable output contains the target. [GH-3218]
- guests/debian: Changing host name works properly. [GH-3283]
- synced\_folders/smb: IDs of synced folders are hashed to work better - synced\_folders/smb: IDs of synced folders are hashed to work better
with VMware. [GH-3219] with VMware. [GH-3219]
- synced\_folders/smb: Passwords with symbols now work. [GH-3242] - synced\_folders/smb: Passwords with symbols now work. [GH-3242]

6
plugins/guests/debian/cap/change_host_name.rb
View File

@ -32,10 +32,12 @@ module VagrantPlugins
end end
def get_current_hostname def get_current_hostname
hostname = ""
sudo "hostname -f" do |type, data| sudo "hostname -f" do |type, data|
return data.chomp if type == :stdout hostname = data.chomp if type == :stdout && hostname.empty?
end end
''
hostname
end end
def update_etc_hostname def update_etc_hostname