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

core: strip newlines off of IDs [GH-2024]

This commit is contained in:
Mitchell Hashimoto 2013-08-09 11:42:18 -07:00
parent 7c9219fc18
commit 471dc2dc7d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -18,6 +18,7 @@ IMPROVEMENTS:
BUG FIXES: BUG FIXES:
- core: strip newlines off of ID file values [GH-2024]
- guests/debian: Force bring up eth0. Fixes hangs on setting hostname. - guests/debian: Force bring up eth0. Fixes hangs on setting hostname.
[GH-2026] [GH-2026]
- hosts/fedora: properly detect later CentOS versions. [GH-2008] - hosts/fedora: properly detect later CentOS versions. [GH-2008]

2
lib/vagrant/machine.rb
View File

@ -108,7 +108,7 @@ module Vagrant
# Read the id file from the data directory if it exists as the # Read the id file from the data directory if it exists as the
# ID for the pre-existing physical representation of this machine. # ID for the pre-existing physical representation of this machine.
id_file = @data_dir.join("id") id_file = @data_dir.join("id")
@id = id_file.read if id_file.file? @id = id_file.read.chomp if id_file.file?
end end
# Initializes the provider last so that it has access to all the # Initializes the provider last so that it has access to all the