From dee099ce967b8a6355e74959feb879477453b121 Mon Sep 17 00:00:00 2001 From: Fabio Rehm Date: Sun, 28 Jul 2013 02:39:08 -0300 Subject: [PATCH] Make use of vagrant's builtin action for handling forwarded port collisions Closes #5 --- CHANGELOG.md | 1 + README.md | 2 -- lib/vagrant-lxc/action.rb | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26145c8..c7088dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ IMPROVEMENTS: - Error out if `redir` is not installed but port forwarding was configured [#112](https://github.com/fgrehm/vagrant-lxc/issues/112) - Support for specifying host interface/ip for binding `redir` [#76](https://github.com/fgrehm/vagrant-lxc/issues/76) - Add Vagrantfile VM name to the container name [#115](https://github.com/fgrehm/vagrant-lxc/issues/115) + - Properly handle forwarded port collisions [#5](https://github.com/fgrehm/vagrant-lxc/issues/5) ## [0.4.0](https://github.com/fgrehm/vagrant-lxc/compare/v0.3.4...v0.4.0) (Jul 18, 2013) diff --git a/README.md b/README.md index 397e0d5..3944669 100644 --- a/README.md +++ b/README.md @@ -141,8 +141,6 @@ base boxes and information on [how to build your own](https://github.com/fgrehm/ ## Current limitations -* The plugin does not detect forwarded ports collision, right now you are - responsible for taking care of that. * [Does not tell you if dependencies are not met](https://github.com/fgrehm/vagrant-lxc/issues/11) (will probably just throw up some random error) * + bunch of other [core features](https://github.com/fgrehm/vagrant-lxc/issues?labels=core&milestone=&page=1&state=open) diff --git a/lib/vagrant-lxc/action.rb b/lib/vagrant-lxc/action.rb index a025936..1b63256 100644 --- a/lib/vagrant-lxc/action.rb +++ b/lib/vagrant-lxc/action.rb @@ -47,7 +47,7 @@ module Vagrant # b.use ClearForwardedPorts b.use Vagrant::Action::Builtin::Provision b.use Vagrant::Action::Builtin::EnvSet, :port_collision_repair => true - # b.use PrepareForwardedPortCollisionParams + b.use Vagrant::Action::Builtin::HandleForwardedPortCollisions b.use ShareFolders b.use Vagrant::Action::Builtin::SetHostname b.use ForwardPorts