53 changed files with 1332 additions and 1800 deletions
--- a/.gitignore
+++ b/.gitignore
@ -19,7 +19,6 @@ doc/
 /tags
 /gems.tags
 /Gemfile.lock
 .vagrant
 /cache
--- a/.travis.yml
+++ b/.travis.yml
@ -1,10 +1,8 @@
 language: ruby
 rvm:
-  - 2.2
+  - 2.0.0
-  - 2.3
+  - 2.1.1
-  - 2.4
+matrix:
-  - 2.5
+  allow_failures:
-install:
+    - rvm: 2.1.1
  - gem install -v 1.12.5 bundler
  - bundle _1.12.5_ install --jobs=3 --retry=3
 script: "bundle exec rake ci"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,258 +1,4 @@
-## [1.4.2](https://github.com/fgrehm/vagrant-lxc/compare/v1.4.1...v1.4.2) (Jul 17, 2018)
+## [1.0.0.alpha.1](https://github.com/fgrehm/vagrant-lxc/compare/v0.8.0...v1.0.0.alpha.1) (Mar 04, 2014)
 FIXES:
  - Fix problems with `redir` 3.x command line. [[GH-467]]
 ## [1.4.1](https://github.com/fgrehm/vagrant-lxc/compare/v1.4.0...v1.4.1) (Apr 30, 2018)
 FEATURES:
  - Add support for LXC v3.0
  - Add support for `redir` 3.x command line. [[GH-460]]
 [GH-460]: https://github.com/fgrehm/vagrant-lxc/issues/460
 ## [1.4.0](https://github.com/fgrehm/vagrant-lxc/compare/v1.3.1...v1.4.0) (Mar 04, 2018)
 FEATURES:
  - Add support for unprivileged containers. [[GH-312]]
 [GH-312]: https://github.com/fgrehm/vagrant-lxc/issues/312
 ## [1.3.1](https://github.com/fgrehm/vagrant-lxc/compare/v1.3.0...v1.3.1) (Fev 06, 2018)
 FIXES:
  - Fix problems with `tmpfs` fiddling in v1.3.0. [[GH-455]]
 [GH-455]: https://github.com/fgrehm/vagrant-lxc/pull/455
 ## [1.3.0](https://github.com/fgrehm/vagrant-lxc/compare/v1.2.4...v1.3.0) (Jan 20, 2018)
 FEATURES:
  - lxc-template: make runnable by unprivileged users [[GH-447]]
  - Use `lxc-info` instead of `lxc-attach` to retrieve container IP
  - Add support for LXC v2.1+ [[GH-445]]
  - Remove 2Gb limitation on `/tmp`. [[GH-406]]
 OTHERS:
  - Bump Vagrant requirements to v1.8+
  - Bump LXC requirements to v1.0+
 [GH-447]: https://github.com/fgrehm/vagrant-lxc/pull/447
 [GH-445]: https://github.com/fgrehm/vagrant-lxc/pull/445
 [GH-406]: https://github.com/fgrehm/vagrant-lxc/pull/406
 ## [1.2.4](https://github.com/fgrehm/vagrant-lxc/compare/v1.2.3...v1.2.4) (Dec 20, 2017)
 BUGFIX:
  - Support alternative `lxcpath` [[GH-413]]
  - Update `pipework` regexp in sudo wrapper for Vagrant 1.9+ [[GH-438]]
  - Work around restrictive `umask` values [[GH-435]]
  - Make `--config` in `lxc-template` optional [[GH-421]]
  - Fix sudo wrapper binpath construction logic [[GH-410]]
  - Fix bug causing CTRL-C on `vagrant up` to destroy the VM [[GH-449]]
 [GH-413]: https://github.com/fgrehm/vagrant-lxc/pull/413
 [GH-438]: https://github.com/fgrehm/vagrant-lxc/pull/438
 [GH-435]: https://github.com/fgrehm/vagrant-lxc/pull/435
 [GH-421]: https://github.com/fgrehm/vagrant-lxc/pull/421
 [GH-410]: https://github.com/fgrehm/vagrant-lxc/pull/410
 [GH-449]: https://github.com/fgrehm/vagrant-lxc/pull/449
 ## [1.2.3](https://github.com/fgrehm/vagrant-lxc/compare/v1.2.2...v1.2.3) (Dec 20, 2016)
  - Fix bug in Gemfile.lock
 ## [1.2.2](https://github.com/fgrehm/vagrant-lxc/compare/v1.2.1...v1.2.2) (Dec 20, 2016)
 BUGFIX:
  - Make the timeout for fetching container IP's configurable [[GH-426]]
  - Load locale file only once [[GH-423]]
  - Preserve xattrs in container filesystems [[GH-411]]
  - Forward port latest pipework script [[GH-408]]
  - Fix handling of non-fatal lxc-stop return code [[GH-405]]
 [GH-426]: https://github.com/fgrehm/vagrant-lxc/pull/426
 [GH-423]: https://github.com/fgrehm/vagrant-lxc/pull/423
 [GH-411]: https://github.com/fgrehm/vagrant-lxc/pull/411
 [GH-408]: https://github.com/fgrehm/vagrant-lxc/pull/408
 [GH-405]: https://github.com/fgrehm/vagrant-lxc/pull/405
 ## [1.2.1](https://github.com/fgrehm/vagrant-lxc/compare/v1.2.0...v1.2.1) (Sep 24, 2015)
 BUGFIX:
  - Fix sudo Wrapper [[GH-393]]
 [GH-393]: https://github.com/fgrehm/vagrant-lxc/pull/393
 ## [1.2.0](https://github.com/fgrehm/vagrant-lxc/compare/v1.1.0...v1.2.0) (Sep 15, 2015)
 FEATURES:
  - Support private networking using DHCP [[GH-352]]
 [GH-352]: https://github.com/fgrehm/vagrant-lxc/pull/352
 IMPROVEMENTS:
  - Move mountpoint creation to lxc template for lvm rootfs support [[GH-361]] / [[GH-359]]
  - Mount selinux sys dir read-only [[GH-357]] / [[GH-301]]
  - Use correct ruby interpreter when generating sudoers file [[GH-355]]
  - Fix shebangs to be more portable [[GH-376]]
  - Fix removal of lxcbr0/virbr0 when using private networking [[GH-383]]
  - Improve /tmp handling by using tmpfs [[GH-362]]
 [GH-301]: https://github.com/fgrehm/vagrant-lxc/issues/301
 [GH-355]: https://github.com/fgrehm/vagrant-lxc/pull/355
 [GH-357]: https://github.com/fgrehm/vagrant-lxc/pull/357
 [GH-359]: https://github.com/fgrehm/vagrant-lxc/issues/359
 [GH-361]: https://github.com/fgrehm/vagrant-lxc/pull/361
 [GH-376]: https://github.com/fgrehm/vagrant-lxc/pull/376
 [GH-383]: https://github.com/fgrehm/vagrant-lxc/pull/383
 [GH-362]: https://github.com/fgrehm/vagrant-lxc/pull/362
 ## [1.1.0](https://github.com/fgrehm/vagrant-lxc/compare/v1.0.1...v1.1.0) (Jan 14, 2015)
 BACKWARDS INCOMPATIBILITIES:
  - Support for Vagrant versions prior to 1.5 have been removed. The plugin now targets
    Vagrant 1.7+ but it _might_ work on 1.5+.
 FEATURES:
  - New experimental support for private networking [[GH-298]] / [[GH-120]].
  - Support for formatted overlayfs path [[GH-329]]
 [GH-298]: https://github.com/fgrehm/vagrant-lxc/pull/298
 [GH-120]: https://github.com/fgrehm/vagrant-lxc/issues/120
 [GH-329]: https://github.com/fgrehm/vagrant-lxc/pull/329
 IMPROVEMENTS:
  - The provider will now have a higher priority over the VirtualBox provider
    in case VirtualBox is installed alongside lxc dependecies.
  - Show an user friendly message when trying to use the plugin on non-Linux
    environments.
 BUG FIXES:
  - Allow backingstore options to be used along with the sudo wrapper script [[GH-310]]
  - Trim automatically generated container names to 64 chars [[GH-337]]
 [GH-337]: https://github.com/fgrehm/vagrant-lxc/issues/337
 [GH-310]: https://github.com/fgrehm/vagrant-lxc/issues/310
 ## [1.0.1](https://github.com/fgrehm/vagrant-lxc/compare/v1.0.0...v1.0.1) (Oct 15, 2014)
 IMPROVEMENTS:
  - Avoid lock race condition when fetching container's IP [[GH-318]] and SSH execution [[GH-321]]
  - Support for custom containers storage path by reading `lxc.lxcpath` [[GH-317]]
 [GH-317]: https://github.com/fgrehm/vagrant-lxc/pull/317
 [GH-318]: https://github.com/fgrehm/vagrant-lxc/pull/318
 [GH-321]: https://github.com/fgrehm/vagrant-lxc/issues/321
 ## [1.0.0](https://github.com/fgrehm/vagrant-lxc/compare/v1.0.0.alpha.3...v1.0.0) (Sep 23, 2014)
 DEPRECATIONS:
  - Support to **all Vagrant versions prior to 1.5 are deprecated**, there is a
    [small layer](lib/vagrant-backports) that ensures compatibility with versions
    starting with 1.1.5 that will be removed on a future release.
  - Official base boxes that were made available from http://bit.ly are no longer
    supported and were removed from @fgrehm's Dropbox, please upgrade your Vagrant
    and vagrant-lxc installation and use a base box from [VagrantCloud](https://vagrantcloud.com/search?provider=lxc)
 BACKWARDS INCOMPATIBILITIES:
  - Remove plugin version from config file name generated by the `vagrant lxc sudoers`
    command. Manual removal of `/usr/local/bin/vagrant-lxc-wrapper-*` / `/etc/sudoers.d/vagrant-lxc-*`
    files are required.
 IMPROVEMENTS:
  - `vagrant-mounted` upstart event is now emited on containers that support it [[GH-302]]
  - Add support for specifying the `--strip-parameters` used by the [default template](scripts/lxc-template)
    when extracting rootfs tarballs [[GH-311]]
 [GH-302]: https://github.com/fgrehm/vagrant-lxc/issues/302
 BUG FIXES:
  - Check for outdated base boxes when starting containers [[GH-314]]
 [GH-311]: https://github.com/fgrehm/vagrant-lxc/pull/311
 [GH-314]: https://github.com/fgrehm/vagrant-lxc/pull/314
 ## [1.0.0.alpha.3](https://github.com/fgrehm/vagrant-lxc/compare/v1.0.0.alpha.2...v1.0.0.alpha.3) (Aug 9, 2014)
 IMPROVEMENTS:
  - Remove `lxc-shutdown` usage in favor of Vagrant's built in graceful halt
  - Add fallback mechanism for platforms without `lxc-attach` support [[GH-294]]
 [GH-294]: https://github.com/fgrehm/vagrant-lxc/pull/294
 BUG FIXES:
  - Figure out the real executable paths for whitelisted commands on the sudo
    wrapper script instead of hardcoding Ubuntu paths [[GH-304]] / [[GH-305]]
  - Attach to containers using the `MOUNT` namespace when attempting to fetch
    container's IP [[GH-300]]
  - Escape space characters for synced folders [[GH-291]]
  - Use Vagrant's ruby on the sudoers file so that it works on systems that don't
    have a global ruby installation [[GH-289]]
 [GH-304]: https://github.com/fgrehm/vagrant-lxc/issues/304
 [GH-305]: https://github.com/fgrehm/vagrant-lxc/issues/305
 [GH-300]: https://github.com/fgrehm/vagrant-lxc/issues/300
 [GH-291]: https://github.com/fgrehm/vagrant-lxc/issues/291
 [GH-289]: https://github.com/fgrehm/vagrant-lxc/issues/289
 ## [1.0.0.alpha.2](https://github.com/fgrehm/vagrant-lxc/compare/v1.0.0.alpha.1...v1.0.0.alpha.2) (May 13, 2014)
 BACKWARDS INCOMPATIBILITIES:
  - The `sudo_wrapper` provider configuration was removed in favor of using the
    secure wrapper generated by `vagrant lxc sudoers` [[GH-272]]
  - Support for specifying backingstore parameters from `Vagrantfile`s for `lxc-create`
    was added and it defaults to the `best` option. On older lxc versions that does not
    support that value, it needs to be set to `none`.
 FEATURES:
  - Add support for specifying backingstore parameters from `Vagrantfile`s [[GH-277]]
 IMPROVEMENTS:
  - Make `dnsmasq` leases MAC address regex check case insensitive [[GH-283]]
  - Use relative paths for `lxc.mount.entry` to avoid issues with `lxc-clone` [[GH-258]].
  - Sort synced folders when mounting [[GH-271]]
  - Privileged ports can now be forwarded with `sudo` [[GH-259]]
  - The `vagrant lxc sudoers` generated sudoers configuration and wrapper script
    are safer and properly whitelists the commands required by vagrant-lxc to run.
    [[GH-272]] / [[GH-269]]
 BUG FIXES:
  - Fix `lxc-create` issues with pre 1.0.0 versions [[GH-282]]
 [GH-283]: https://github.com/fgrehm/vagrant-lxc/pull/283
 [GH-282]: https://github.com/fgrehm/vagrant-lxc/pull/282
 [GH-269]: https://github.com/fgrehm/vagrant-lxc/issues/269
 [GH-272]: https://github.com/fgrehm/vagrant-lxc/pull/272
 [GH-259]: https://github.com/fgrehm/vagrant-lxc/pull/259
 [GH-271]: https://github.com/fgrehm/vagrant-lxc/pull/271
 [GH-277]: https://github.com/fgrehm/vagrant-lxc/pull/277
 [GH-258]: https://github.com/fgrehm/vagrant-lxc/issues/258
 ## [1.0.0.alpha.1](https://github.com/fgrehm/vagrant-lxc/compare/v0.8.0...v1.0.0.alpha.1) (Apr 06, 2014)
 DEPRECATIONS:
--- a/8
+++ b/8
@ -1,16 +1,16 @@
 source 'https://rubygems.org'
 group :development do
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.5.1'
  gem 'guard'
  gem 'guard-rspec'
  gem 'rb-inotify'
 end
 group :development, :test do
-  gem 'rake', '~> 10.4.2'
+  gem 'rake'
-  gem 'rspec', '~> 3.5.0'
+  gem 'rspec',        '2.99.0.beta2'
-  gem 'coveralls', '~> 0.7.2', require: (ENV['COVERAGE'] == 'true')
+  gem 'coveralls',    require: (ENV['COVERAGE'] == 'true')
  gem 'vagrant-spec', git: 'https://github.com/mitchellh/vagrant-spec.git'
 end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -0,0 +1,135 @@
 GIT
  remote: https://github.com/fgrehm/vagrant-cachier.git
  revision: 2df1e319408a7e6f1c6e75d48e36591199e98527
  specs:
    vagrant-cachier (0.6.1.dev)
 GIT
  remote: https://github.com/fgrehm/vagrant-pristine.git
  revision: 503dbc47848c81d0fbfa6840491856f518d244a1
  specs:
    vagrant-pristine (0.3.0)
 GIT
  remote: https://github.com/mitchellh/vagrant-spec.git
  revision: aae28ee57071cdd121ca782c6e0709a5c650a4be
  specs:
    vagrant-spec (0.0.1)
      childprocess (~> 0.5.0)
      log4r (~> 1.1.9)
      rspec (~> 2.14)
      thor (~> 0.18.1)
 GIT
  remote: https://github.com/mitchellh/vagrant.git
  revision: 6977e93ba98fd19112b1fed74dafb8619f581984
  tag: v1.5.1
  specs:
    vagrant (1.5.1)
      bundler (~> 1.5.2)
      childprocess (~> 0.5.0)
      erubis (~> 2.7.0)
      i18n (~> 0.6.0)
      listen (~> 2.4.0)
      log4r (~> 1.1.9, < 1.1.11)
      net-scp (~> 1.1.0)
      net-ssh (>= 2.6.6, < 2.8.0)
      rb-kqueue (~> 0.2.0)
      wdm (~> 0.1.0)
 PATH
  remote: .
  specs:
    vagrant-lxc (1.0.0.alpha.1)
 GEM
  remote: https://rubygems.org/
  specs:
    celluloid (0.15.2)
      timers (~> 1.1.0)
    childprocess (0.5.1)
      ffi (~> 1.0, >= 1.0.11)
    coderay (1.1.0)
    coveralls (0.7.0)
      multi_json (~> 1.3)
      rest-client
      simplecov (>= 0.7)
      term-ansicolor
      thor
    diff-lcs (1.2.5)
    docile (1.1.3)
    erubis (2.7.0)
    ffi (1.9.3)
    formatador (0.2.4)
    guard (2.4.0)
      formatador (>= 0.2.4)
      listen (~> 2.1)
      lumberjack (~> 1.0)
      pry (>= 0.9.12)
      thor (>= 0.18.1)
    guard-rspec (4.2.8)
      guard (~> 2.1)
      rspec (>= 2.14, < 4.0)
    i18n (0.6.9)
    listen (2.4.1)
      celluloid (>= 0.15.2)
      rb-fsevent (>= 0.9.3)
      rb-inotify (>= 0.9)
    log4r (1.1.10)
    lumberjack (1.0.4)
    method_source (0.8.2)
    mime-types (2.1)
    multi_json (1.9.0)
    net-scp (1.1.2)
      net-ssh (>= 2.6.5)
    net-ssh (2.7.0)
    pry (0.9.12.6)
      coderay (~> 1.0)
      method_source (~> 0.8)
      slop (~> 3.4)
    rake (10.1.1)
    rb-fsevent (0.9.4)
    rb-inotify (0.9.3)
      ffi (>= 0.5.0)
    rb-kqueue (0.2.2)
      ffi (>= 0.5.0)
    rest-client (1.6.7)
      mime-types (>= 1.16)
    rspec (2.99.0.beta2)
      rspec-core (= 2.99.0.beta2)
      rspec-expectations (= 2.99.0.beta2)
      rspec-mocks (= 2.99.0.beta2)
    rspec-core (2.99.0.beta2)
    rspec-expectations (2.99.0.beta2)
      diff-lcs (>= 1.1.3, < 2.0)
    rspec-mocks (2.99.0.beta2)
    simplecov (0.8.2)
      docile (~> 1.1.0)
      multi_json
      simplecov-html (~> 0.8.0)
    simplecov-html (0.8.0)
    slop (3.5.0)
    term-ansicolor (1.3.0)
      tins (~> 1.0)
    thor (0.18.1)
    timers (1.1.0)
    tins (1.0.0)
    vagrant-omnibus (1.3.1)
    wdm (0.1.0)
 PLATFORMS
  ruby
 DEPENDENCIES
  coveralls
  guard
  guard-rspec
  rake
  rb-inotify
  rspec (= 2.99.0.beta2)
  vagrant!
  vagrant-cachier!
  vagrant-lxc!
  vagrant-omnibus
  vagrant-pristine!
  vagrant-spec!
--- a/README.md
+++ b/README.md
@ -1,40 +1,58 @@
 🟢 We plan to support and maintain vagrant-lxc, as well as clean it up.<br/>
 🟢 Please feel free to contribute Issues and pull requests.<br/>
 🟢 P.S: Thanks [Fabio Rehm](https://fabiorehm.com) for the amazing initial project.
 # vagrant-lxc
-[![Build Status](https://travis-ci.org/fgrehm/vagrant-lxc.png?branch=master)](https://travis-ci.org/fgrehm/vagrant-lxc) [![Gem Version](https://badge.fury.io/rb/vagrant-lxc.png)](http://badge.fury.io/rb/vagrant-lxc) [![Code Climate](https://codeclimate.com/github/fgrehm/vagrant-lxc.png)](https://codeclimate.com/github/fgrehm/vagrant-lxc) [![Coverage Status](https://coveralls.io/repos/fgrehm/vagrant-lxc/badge.png?branch=master)](https://coveralls.io/r/fgrehm/vagrant-lxc) [![Gitter chat](https://badges.gitter.im/fgrehm/vagrant-lxc.png)](https://gitter.im/fgrehm/vagrant-lxc)
+[![Build Status](https://travis-ci.org/fgrehm/vagrant-lxc.png?branch=master)](https://travis-ci.org/fgrehm/vagrant-lxc) [![Gem Version](https://badge.fury.io/rb/vagrant-lxc.png)](http://badge.fury.io/rb/vagrant-lxc) [![Code Climate](https://codeclimate.com/github/fgrehm/vagrant-lxc.png)](https://codeclimate.com/github/fgrehm/vagrant-lxc) [![Coverage Status](https://coveralls.io/repos/fgrehm/vagrant-lxc/badge.png?branch=master)](https://coveralls.io/r/fgrehm/vagrant-lxc) [![Gittip](http://img.shields.io/gittip/fgrehm.svg)](https://www.gittip.com/fgrehm/)
-[LXC](http://lxc.sourceforge.net/) provider for [Vagrant](http://www.vagrantup.com/) 1.9+
+[LXC](http://lxc.sourceforge.net/) provider for [Vagrant](http://www.vagrantup.com/) 1.1+
 This is a Vagrant plugin that allows it to control and provision Linux Containers
 as an alternative to the built in VirtualBox provider for Linux hosts. Check out
 [this blog post](http://fabiorehm.com/blog/2013/04/28/lxc-provider-for-vagrant/)
 to see it in action.
 **NOTICE:** The master branch is targetting an initial beta for 1.0.0, for the
 latest stable version of the plugin, please check the [0.8-stable](https://github.com/fgrehm/vagrant-lxc/tree/0.8-stable)
 branch.
 ## Usage with Vagrant 1.5
 Usage with the recently released Vagrant 1.5 is only possible by [building the
 plugin from sources](https://github.com/fgrehm/vagrant-lxc/wiki/Development#wiki-installing-the-plugin-from-source).
 The 1.0.0.beta1 version of the plugin that will ship with the changes required
 is expected to be released by April, 2014.
 ## Features
 * Provides the same workflow as the Vagrant VirtualBox provider
-* Port forwarding via [`redir`](https://github.com/troglobit/redir)
+* Port forwarding via [`redir`](http://linux.die.net/man/1/redir)
-* Private networking via [`pipework`](https://github.com/jpetazzo/pipework)
+
 As of now, it does not support public / private networks, but [private networks](https://github.com/fgrehm/vagrant-lxc/issues/120)
 will be coming along _soon_.
 ## Requirements
-* [Vagrant 1.9+](http://www.vagrantup.com/downloads.html)
+* [Vagrant 1.1+](http://www.vagrantup.com/downloads.html)
-* lxc >=2.1
+* lxc 0.7.5+
 * `redir` (if you are planning to use port forwarding)
-* `brctl` (if you are planning to use private networks, on Ubuntu this means `apt-get install bridge-utils`)
+* A [kernel != 3.5.0-17.28](https://github.com/fgrehm/vagrant-lxc/wiki/Troubleshooting#wiki-im-unable-to-restart-containers)
-The plugin is known to work better and pretty much out of the box on Ubuntu 14.04+
+The plugin is known to work better and pretty much out of the box on Ubuntu 12.04+
-hosts and installing the dependencies on it basically means a
+hosts and installing the dependencies on it basically means a `apt-get install lxc lxc-templates cgroup-lite redir`
-`apt-get install lxc lxc-templates cgroup-lite redir`. For setting up other
+and a `apt-get update && apt-get dist-upgrade` to upgrade the kernel. For Debian
-types of hosts please have a look at the [Wiki](https://github.com/fgrehm/vagrant-lxc/wiki).
+hosts you'll need to follow the instructions described on the [Wiki](https://github.com/fgrehm/vagrant-lxc/wiki/Usage-on-debian-hosts).
 Some manual steps are required to set up a Linode machine prior to using this
 plugin, please check [the wiki](https://github.com/fgrehm/vagrant-lxc/wiki/Usage-on-Linode)
 for more information. Documentation on how to set things up for other distros
 [are welcome](https://github.com/fgrehm/vagrant-lxc/wiki) :)
 If you are on a Mac or Windows machine, you might want to have a look at [this](http://the.taoofmac.com/space/HOWTO/Vagrant)
 blog post for some ideas on how to set things up or check out [this other repo](https://github.com/fgrehm/vagrant-lxc-vbox-hosts)
 for a set of Vagrant VirtualBox machines ready for vagrant-lxc usage.
 **NOTE: Some users have been experiencing networking issues and right now you might need to
 disable checksum offloading as described on [this comment](https://github.com/fgrehm/vagrant-lxc/issues/153#issuecomment-26441273)**
 ## Installation
@ -45,31 +63,33 @@ vagrant plugin install vagrant-lxc
 ## Quick start
 On Vagrant 1.5+:
 ```
 vagrant init fgrehm/precise64-lxc
 vagrant up --provider=lxc
 ```
-_More information about skipping the `--provider` argument can be found at the
+On Vagrant < 1.5:
 "DEFAULT PROVIDER" section of [Vagrant docs](https://docs.vagrantup.com/v2/providers/basic_usage.html)_
-## Base boxes
+```
 vagrant init precise64 http://bit.ly/vagrant-lxc-precise64-2013-10-23
 vagrant up --provider=lxc
 ```
-Base boxes provided on Atlas haven't been refreshed for a good while and shouldn't be relied on.
+If you are using Vagrant 1.2+ you can also set the `VAGRANT_DEFAULT_PROVIDER`
-Your best best is to build your boxes yourself. Some scripts to build your own are available at
+environmental variable to `lxc` in order to avoid typing `--provider=lxc` all
-[hsoft/vagrant-lxc-base-boxes](https://github.com/hsoft/vagrant-lxc-base-boxes).
+the time.
 If you want to build your own boxes, please have a look at [`BOXES.md`](https://github.com/fgrehm/vagrant-lxc/tree/master/BOXES.md)
 for more information.
-## Advanced configuration
+### Advanced configuration
-You can modify container configurations from within your Vagrantfile using the
+If you want, you can modify container configurations from within your Vagrantfile
-[provider block](http://docs.vagrantup.com/v2/providers/configuration.html):
+using the [provider block](http://docs.vagrantup.com/v2/providers/configuration.html):
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.box = "fgrehm/trusty64-lxc"
+  config.vm.box = "quantal64"
  config.vm.provider :lxc do |lxc|
    # Same effect as 'customize ["modifyvm", :id, "--memory", "1024"]' for VirtualBox
    lxc.customize 'cgroup.memory.limit_in_bytes', '1024M'
@ -83,28 +103,6 @@ prior to starting it.
 For other configuration options, please check the [lxc.conf manpages](http://manpages.ubuntu.com/manpages/precise/man5/lxc.conf.5.html).
 ### Private Networks
 Starting with vagrant-lxc 1.1.0, there is some rudimentary support for configuring
 [Private Networks](https://docs.vagrantup.com/v2/networking/private_network.html)
 by leveraging the [pipework](https://github.com/jpetazzo/pipework) project.
 On its current state, there is a requirement for setting the bridge name that
 will be created and will allow your machine to comunicate with the container
 For example:
 ```ruby
 Vagrant.configure("2") do |config|
  config.vm.network "private_network", ip: "192.168.2.100", lxc__bridge_name: 'vlxcbr1'
 end
 ```
 Will create a new `veth` device for the container and will set up (or reuse)
 a `vlxcbr1` bridge between your machine and the `veth` device. Once the last
 vagrant-lxc container attached to the bridge gets `vagrant halt`ed, the plugin
 will delete the bridge.
 ### Container naming
 By default vagrant-lxc will attempt to generate a unique container name
@ -113,6 +111,8 @@ for you. However, if the container name is important to you, you may use the
 ```ruby
 Vagrant.configure("2") do |config|
  config.vm.box = "quantal64"
  config.vm.define "db" do |node|
    node.vm.provider :lxc do |lxc|
      lxc.container_name = :machine # Sets the container name to 'db'
@ -122,52 +122,25 @@ Vagrant.configure("2") do |config|
 end
 ```
-_Please note that there is a 64 chars limit and the container name will be
+### Avoiding `sudo` passwords
 trimmed down to that to ensure we can always bring the container up.
-### Backingstore options
+This plugin requires **a lot** of `sudo`ing since [user namespaces](https://wiki.ubuntu.com/UserNamespace)
-
+are not supported on mainstream kernels. To work around that, you can use the
-Support for setting `lxc-create`'s backingstore option (`-B` and related) can be
+`vagrant lxc sudoers` command which will create a file under `/etc/sudoers.d/vagrant-lxc-<USER>`
-specified from the provider block and it defaults to `best`, to change it:
+whitelisting all commands required by `vagrant-lxc` to run.
 ```ruby
 Vagrant.configure("2") do |config|
  config.vm.provider :lxc do |lxc|
    lxc.backingstore = 'lvm' # or 'btrfs', 'overlayfs', ...
    # lvm specific options
    lxc.backingstore_option '--vgname', 'schroots'
    lxc.backingstore_option '--fssize', '5G'
    lxc.backingstore_option '--fstype', 'xfs'
  end
 end
 ```
 ## Unprivileged containers support
 Since v1.4.0, `vagrant-lxc` gained support for unprivileged containers. For now, since it's a new
 feature, privileged containers are still the default, but you can have your `Vagrantfile` use
 unprivileged containers with the `privileged` flag (which defaults to `true`). Example:
 ```ruby
 Vagrant.configure("2") do |config|
  config.vm.provider :lxc do |lxc|
    lxc.privileged = false
  end
 end
 ```
 For unprivileged containers to work with `vagrant-lxc`, you need a properly configured system. On
 some distros, it can be somewhat of a challenge. Your journey to configuring your system can start
 with [Stéphane Graber's blog post about it](https://stgraber.org/2014/01/17/lxc-1-0-unprivileged-containers/).
 ## Avoiding `sudo` passwords
 If you're not using unprivileged containers, this plugin requires **a lot** of `sudo`ing To work
 around that, you can use the `vagrant lxc sudoers` command which will create a file under
 `/etc/sudoers.d/vagrant-lxc` whitelisting all commands required by `vagrant-lxc` to run.
 If you are interested on what will be generated by that command, please check
-[this code](lib/vagrant-lxc/command/sudoers.rb).
+[this code](lib/vagrant-lxc/commands/sudoers.rb#L58-L81).
 _vagrant-lxc < 1.0.0 users, please check this [Wiki page](https://github.com/fgrehm/vagrant-lxc/wiki/Avoiding-%27sudo%27-passwords)_
 ### Base boxes
 Base boxes can be found on [VagrantCloud](https://vagrantcloud.com/search?provider=lxc)
 and some scripts to build your own are available at [fgrehm/vagrant-lxc-base-boxes](https://github.com/fgrehm/vagrant-lxc-base-boxes).
 If you want to build your own boxes, please have a look at [`BOXES.md`](https://github.com/fgrehm/vagrant-lxc/tree/master/BOXES.md)
 for more information.
 ## More information
--- a/development/Vagrantfile
+++ b/development/Vagrantfile
@ -0,0 +1,92 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 require 'pathname'
 BASE_URL          = 'http://bit.ly/'
 LAST_RELEASE_DATE = '2013-09-28'
 LOCAL_BOXES_PATH  = Pathname('../boxes/output').expand_path
 def lxc_box_url(release_name)
  box_name       = "vagrant-lxc-#{release_name}-amd64-#{LAST_RELEASE_DATE}"
  local_box_file = LOCAL_BOXES_PATH.join("#{box_name}.box")
  local_box_file.exist? ?
    local_box_file.to_s :
    "#{BASE_URL}/#{box_name}"
 end
 BOXES = {
  precise: {
    lxc_url:  lxc_box_url('precise'),
    vbox_url: 'http://files.vagrantup.com/precise64.box'
  },
  quantal: {
    lxc_url:  lxc_box_url('quantal'),
    vbox_url: 'https://github.com/downloads/roderik/VagrantQuantal64Box/quantal64.box'
  },
  raring:  {
    lxc_url:  lxc_box_url('raring'),
    vbox_url: 'http://cloud-images.ubuntu.com/vagrant/raring/current/raring-server-cloudimg-amd64-vagrant-disk1.box'
  },
  saucy: {
    vbox_url: 'http://cloud-images.ubuntu.com/vagrant/saucy/current/saucy-server-cloudimg-amd64-vagrant-disk1.box'
  },
  squeeze: {
    lxc_url:  lxc_box_url('squeeze'),
    # https://gist.github.com/henare/1964037
    vbox_url: 'http://dl.dropbox.com/u/174733/debian-squeeze-64.box'
  },
  wheezy:  {
    lxc_url:  lxc_box_url('wheezy'),
    vbox_url: 'http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210.box'
  },
  sid: {
    lxc_url:  lxc_box_url('sid'),
  }
 }
 Vagrant.require_plugin 'vagrant-lxc'
 Vagrant.require_plugin 'vagrant-cachier'
 Vagrant.require_plugin 'vagrant-pristine'
 Vagrant.configure("2") do |config|
  config.vm.synced_folder "../", "/vagrant", id: 'vagrant-root', nfs: true
  config.cache.scope = :machine
  ip_suffix = 30
  BOXES.each do |box_name, box_config|
    config.vm.define(box_name.to_sym) do |vm_config|
      vm_config.vm.network :private_network, ip: "192.168.50.#{ip_suffix += 1}"
      vm_config.vm.box      = "#{box_name}64"
      if box_config[:vbox_url]
        vm_config.vm.provider :virtualbox do |vb, vb_config|
          vb_config.vm.box_url  = box_config[:vbox_url]
          vb_config.vm.hostname = 'vbox'
          vb.customize [
            "modifyvm", :id,
            "--memory", '1536',
            "--cpus", '2'
          ]
        end
      end
      if box_config[:lxc_url]
        vm_config.vm.provider :lxc do |lxc, lxc_config|
          lxc_config.vm.box_url  = box_config[:lxc_url]
          lxc_config.vm.hostname = 'lxc-dev-box'
          # Required to boot nested containers
          lxc.customize 'aa_profile', 'unconfined' unless %w(squeeze wheezy sid).include? box_name.to_s
        end
      end
    end
  end
  config.vm.provision :puppet do |puppet|
    puppet.manifests_path = "."
    puppet.manifest_file  = "site.pp"
    puppet.options << [ '--verbose', '--debug' ]
  end
 end
--- a/development/lxc-configs/lxc-dev-box
+++ b/development/lxc-configs/lxc-dev-box
@ -0,0 +1,37 @@
 ###############################################################################
 # This file has the same configs as the built in /etc/default/lxc on Ubuntu,
 # we only changed IPs to 10.0.254.* to avoid collision with LXC default 10.0.3.*
 # which is likely to be running from the host machine
 ###############################################################################
 # MIRROR to be used by ubuntu template at container creation:
 # Leaving it undefined is fine
 #MIRROR="http://archive.ubuntu.com/ubuntu"
 # or
 #MIRROR="http://<host-ip-addr>:3142/archive.ubuntu.com/ubuntu"
 # LXC_AUTO - whether or not to start containers symlinked under
 # /etc/lxc/auto
 LXC_AUTO="true"
 # Leave USE_LXC_BRIDGE as "true" if you want to use lxcbr0 for your
 # containers.  Set to "false" if you'll use virbr0 or another existing
 # bridge, or mavlan to your host's NIC.
 USE_LXC_BRIDGE="true"
 # If you change the LXC_BRIDGE to something other than lxcbr1, then
 # you will also need to update your /etc/lxc/lxc.conf as well as the
 # configuration (/var/lib/lxc/<container>/config) for any containers
 # already created using the default config to reflect the new bridge
 # name.
 # If you have the dnsmasq daemon installed, you'll also have to update
 # /etc/dnsmasq.d/lxc and restart the system wide dnsmasq daemon.
 LXC_BRIDGE="lxcbr0"
 LXC_ADDR="10.0.253.1"
 LXC_NETMASK="255.255.255.0"
 LXC_NETWORK="10.0.253.0/24"
 LXC_DHCP_RANGE="10.0.253.2,10.0.253.254"
 LXC_DHCP_MAX="253"
 LXC_SHUTDOWN_TIMEOUT=120
--- a/development/lxc-configs/sid
+++ b/development/lxc-configs/sid
@ -0,0 +1,37 @@
 ###############################################################################
 # This file has the same configs as the built in /etc/default/lxc on Ubuntu,
 # we only changed IPs to 10.0.254.* to avoid collision with LXC default 10.0.3.*
 # which is likely to be running from the host machine
 ###############################################################################
 # MIRROR to be used by ubuntu template at container creation:
 # Leaving it undefined is fine
 #MIRROR="http://archive.ubuntu.com/ubuntu"
 # or
 #MIRROR="http://<host-ip-addr>:3142/archive.ubuntu.com/ubuntu"
 # LXC_AUTO - whether or not to start containers symlinked under
 # /etc/lxc/auto
 LXC_AUTO="true"
 # Leave USE_LXC_BRIDGE as "true" if you want to use lxcbr0 for your
 # containers.  Set to "false" if you'll use virbr0 or another existing
 # bridge, or mavlan to your host's NIC.
 USE_LXC_BRIDGE="true"
 # If you change the LXC_BRIDGE to something other than lxcbr1, then
 # you will also need to update your /etc/lxc/lxc.conf as well as the
 # configuration (/var/lib/lxc/<container>/config) for any containers
 # already created using the default config to reflect the new bridge
 # name.
 # If you have the dnsmasq daemon installed, you'll also have to update
 # /etc/dnsmasq.d/lxc and restart the system wide dnsmasq daemon.
 LXC_BRIDGE="lxcbr0"
 LXC_ADDR="10.0.251.1"
 LXC_NETMASK="255.255.255.0"
 LXC_NETWORK="10.0.251.0/24"
 LXC_DHCP_RANGE="10.0.253.2,10.0.251.254"
 LXC_DHCP_MAX="253"
 LXC_SHUTDOWN_TIMEOUT=120
--- a/development/lxc-configs/squeeze
+++ b/development/lxc-configs/squeeze
@ -0,0 +1,37 @@
 ###############################################################################
 # This file has the same configs as the built in /etc/default/lxc on Ubuntu,
 # we only changed IPs to 10.0.254.* to avoid collision with LXC default 10.0.3.*
 # which is likely to be running from the host machine
 ###############################################################################
 # MIRROR to be used by ubuntu template at container creation:
 # Leaving it undefined is fine
 #MIRROR="http://archive.ubuntu.com/ubuntu"
 # or
 #MIRROR="http://<host-ip-addr>:3142/archive.ubuntu.com/ubuntu"
 # LXC_AUTO - whether or not to start containers symlinked under
 # /etc/lxc/auto
 LXC_AUTO="true"
 # Leave USE_LXC_BRIDGE as "true" if you want to use lxcbr0 for your
 # containers.  Set to "false" if you'll use virbr0 or another existing
 # bridge, or mavlan to your host's NIC.
 USE_LXC_BRIDGE="true"
 # If you change the LXC_BRIDGE to something other than lxcbr1, then
 # you will also need to update your /etc/lxc/lxc.conf as well as the
 # configuration (/var/lib/lxc/<container>/config) for any containers
 # already created using the default config to reflect the new bridge
 # name.
 # If you have the dnsmasq daemon installed, you'll also have to update
 # /etc/dnsmasq.d/lxc and restart the system wide dnsmasq daemon.
 LXC_BRIDGE="lxcbr0"
 LXC_ADDR="10.0.250.1"
 LXC_NETMASK="255.255.255.0"
 LXC_NETWORK="10.0.250.0/24"
 LXC_DHCP_RANGE="10.0.253.2,10.0.250.254"
 LXC_DHCP_MAX="253"
 LXC_SHUTDOWN_TIMEOUT=120
--- a/development/lxc-configs/vbox
+++ b/development/lxc-configs/vbox
@ -0,0 +1,37 @@
 ###############################################################################
 # This file has the same configs as the built in /etc/default/lxc on Ubuntu,
 # we only changed IPs to 10.0.254.* to avoid collision with LXC default 10.0.3.*
 # which is likely to be running from the host machine
 ###############################################################################
 # MIRROR to be used by ubuntu template at container creation:
 # Leaving it undefined is fine
 #MIRROR="http://archive.ubuntu.com/ubuntu"
 # or
 #MIRROR="http://<host-ip-addr>:3142/archive.ubuntu.com/ubuntu"
 # LXC_AUTO - whether or not to start containers symlinked under
 # /etc/lxc/auto
 LXC_AUTO="true"
 # Leave USE_LXC_BRIDGE as "true" if you want to use lxcbr0 for your
 # containers.  Set to "false" if you'll use virbr0 or another existing
 # bridge, or mavlan to your host's NIC.
 USE_LXC_BRIDGE="true"
 # If you change the LXC_BRIDGE to something other than lxcbr1, then
 # you will also need to update your /etc/lxc/lxc.conf as well as the
 # configuration (/var/lib/lxc/<container>/config) for any containers
 # already created using the default config to reflect the new bridge
 # name.
 # If you have the dnsmasq daemon installed, you'll also have to update
 # /etc/dnsmasq.d/lxc and restart the system wide dnsmasq daemon.
 LXC_BRIDGE="lxcbr0"
 LXC_ADDR="10.0.254.1"
 LXC_NETMASK="255.255.255.0"
 LXC_NETWORK="10.0.254.0/24"
 LXC_DHCP_RANGE="10.0.254.2,10.0.254.254"
 LXC_DHCP_MAX="253"
 LXC_SHUTDOWN_TIMEOUT=120
--- a/development/lxc-configs/wheezy
+++ b/development/lxc-configs/wheezy
@ -0,0 +1,37 @@
 ###############################################################################
 # This file has the same configs as the built in /etc/default/lxc on Ubuntu,
 # we only changed IPs to 10.0.254.* to avoid collision with LXC default 10.0.3.*
 # which is likely to be running from the host machine
 ###############################################################################
 # MIRROR to be used by ubuntu template at container creation:
 # Leaving it undefined is fine
 #MIRROR="http://archive.ubuntu.com/ubuntu"
 # or
 #MIRROR="http://<host-ip-addr>:3142/archive.ubuntu.com/ubuntu"
 # LXC_AUTO - whether or not to start containers symlinked under
 # /etc/lxc/auto
 LXC_AUTO="true"
 # Leave USE_LXC_BRIDGE as "true" if you want to use lxcbr0 for your
 # containers.  Set to "false" if you'll use virbr0 or another existing
 # bridge, or mavlan to your host's NIC.
 USE_LXC_BRIDGE="true"
 # If you change the LXC_BRIDGE to something other than lxcbr1, then
 # you will also need to update your /etc/lxc/lxc.conf as well as the
 # configuration (/var/lib/lxc/<container>/config) for any containers
 # already created using the default config to reflect the new bridge
 # name.
 # If you have the dnsmasq daemon installed, you'll also have to update
 # /etc/dnsmasq.d/lxc and restart the system wide dnsmasq daemon.
 LXC_BRIDGE="lxcbr0"
 LXC_ADDR="10.0.252.1"
 LXC_NETMASK="255.255.255.0"
 LXC_NETWORK="10.0.252.0/24"
 LXC_DHCP_RANGE="10.0.253.2,10.0.252.254"
 LXC_DHCP_MAX="253"
 LXC_SHUTDOWN_TIMEOUT=120
--- a/development/site.pp
+++ b/development/site.pp
@ -0,0 +1,151 @@
 Exec { path => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/', '/usr/local/bin'] }
 stage { 'preinstall':
  before => Stage['main']
 }
 class apt_get_update {
  exec { 'apt-get -y update':
    unless => "test -f /etc/default/lxc"
  }
 }
 class { 'apt_get_update':
  stage => preinstall
 }
 # Because I'm lazy ;)
 exec {
  'echo "alias be=\"bundle exec\"" >> /home/vagrant/.bashrc':
    unless => 'grep -q "bundle exec" /home/vagrant/.bashrc';
  'echo "export VAGRANT_DEFAULT_PROVIDER=lxc" >> /home/vagrant/.bashrc':
    unless => 'grep -q "VAGRANT_DEFAULT_PROVIDER" /home/vagrant/.bashrc';
  'echo "cd /vagrant" >> /home/vagrant/.bashrc':
    unless => 'grep -q "cd /vagrant" /home/vagrant/.bashrc';
 }
 # Overwrite LXC default configs
 exec {
  'config-lxc':
    # We need to do this otherwise IPs will collide with the host's lxc dhcp server.
    # If we install the package prior to setting this configs the container will go crazy.
    command => "cp /vagrant/development/lxc-configs/${hostname} /etc/default/lxc"
  ;
 }
 # Install dependencies
 package {
  [ 'libffi-dev', 'bsdtar', 'exuberant-ctags', 'ruby1.9.1-dev', 'htop', 'git',
    'build-essential', 'redir', 'curl', 'vim', 'btrfs-tools', 'psmisc' ]:
    ensure   => 'installed'
  ;
  'lxc':
    require => Exec['config-lxc']
  ;
  'bundler':
    ensure   => 'installed',
    provider => 'gem'
  ;
 }
 # Upgrade kernel if needed
 package {
  [ 'linux-image-generic', 'linux-headers-generic' ]:
    ensure => 'latest'
 }
 # Make sure we can create and boot nested containers
 if $hostname == 'vbox' {
  package { 'apparmor-utils': }
  exec    { 'aa-complain /usr/bin/lxc-start': }
 }
 # Allow gems to be installed on vagrant user home avoiding "sudo"s
 # Tks to http://wiki.railsplayground.com/railsplayground/show/How+to+install+gems+and+non+root+user
 file {
  '/home/vagrant/gems':
    ensure => directory,
    owner  => 'vagrant',
    group  => 'vagrant'
  ;
  '/home/vagrant/.gemrc':
    content => '
 ---
 :verbose: true
 gem: --no-ri --no-rdoc
 :update_sources: true
 :sources:
 - http://gems.rubyforge.org
 - http://gems.github.com
 :backtrace: false
 :bulk_threshold: 1000
 :benchmark: false
 gemhome: /home/vagrant/gems
 gempath:
 - /home/vagrant/gems
 - /var/lib/gems/1.9.1
 '
 }
 exec {
  'set-gem-paths':
    command => 'cat << EOF >> /home/vagrant/.profile
 export GEM_HOME=/home/vagrant/gems
 export GEM_PATH=/home/vagrant/gems:/var/lib/gems/1.9.1
 export PATH=$PATH:/home/vagrant/gems/bin
 EOF',
    unless => 'grep -q "GEM_HOME" /home/vagrant/.profile'
 }
 # Bundle!
 exec {
  'su -l vagrant -c "cd /vagrant && bundle install"':
    # We are checking for guard-rspec here but it could be any gem...
    unless  => 'gem list guard | grep -q rspec',
    cwd     => '/vagrant',
    require => [
      Exec['set-gem-paths'],
      File['/home/vagrant/gems', '/home/vagrant/.gemrc'],
      Package['bundler']
    ]
 }
 # Setup vagrant default ssh key
 file {
  '/home/vagrant/.ssh':
    ensure => directory,
    owner  => 'vagrant',
    group  => 'vagrant'
 }
 exec {
  'download-private-key':
    command => 'wget https://raw.github.com/mitchellh/vagrant/master/keys/vagrant -O /home/vagrant/.ssh/id_rsa',
    creates => '/home/vagrant/.ssh/id_rsa',
    require => File['/home/vagrant/.ssh'],
    user    => 'vagrant'
  ;
  'wget https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub -O /home/vagrant/.ssh/id_rsa.pub':
    creates => '/home/vagrant/.ssh/id_rsa.pub',
    require => File['/home/vagrant/.ssh'],
    user    => 'vagrant'
  ;
 }
 file {
  '/home/vagrant/.ssh/id_rsa':
    ensure  => 'present',
    mode    => '0600',
    require => Exec['download-private-key']
 }
 # Passwordless sudo wrapper script
 file {
  '/usr/bin/lxc-vagrant-wrapper':
    ensure  => 'present',
    mode    => '0755',
    content => "#!/usr/bin/env ruby
 exec ARGV.join(' ')"
 }
--- a/lib/vagrant-backports/README.md
+++ b/lib/vagrant-backports/README.md
@ -0,0 +1,12 @@
 # vagrant-backports
 <!--
 [![Build Status](https://travis-ci.org/fgrehm/vagrant-backports.png?branch=master)](https://travis-ci.org/fgrehm/vagrant-backports) [![Gem Version](https://badge.fury.io/rb/vagrant-backports.png)](http://badge.fury.io/rb/vagrant-backports) [![Code Climate](https://codeclimate.com/github/fgrehm/vagrant-backports.png)](https://codeclimate.com/github/fgrehm/vagrant-backports) [![Coverage Status](https://coveralls.io/repos/fgrehm/vagrant-backports/badge.png?branch=master)](https://coveralls.io/r/fgrehm/vagrant-backports) [![Gittip](http://img.shields.io/gittip/fgrehm.svg)](https://www.gittip.com/fgrehm/)
 -->
 A _"hypothetical"_ gem that helps Vagrant plugin developers to stay sane when
 keeping up with Vagrant improvements by backporting parts of its recent versions
 functionality.
 More information will be provided if there is enough interest on having this
 extracted as a separate gem.
--- a/lib/vagrant-backports/action/handle_box.rb
+++ b/lib/vagrant-backports/action/handle_box.rb
@ -0,0 +1 @@
 Vagrant::Action::Builtin.const_set :HandleBox, Vagrant::Action::Builtin::HandleBoxUrl
--- a/lib/vagrant-backports/action/is_state.rb
+++ b/lib/vagrant-backports/action/is_state.rb
@ -0,0 +1,34 @@
 module Vagrant
  module Backports
    module Action
      # This middleware is meant to be used with Call and can check if
      # a machine is in the given state ID.
      class IsState
        # Note: Any of the arguments can be arrays as well.
        #
        # @param [Symbol] target_state The target state ID that means that
        #   the machine was properly shut down.
        # @param [Symbol] source_state The source state ID that the machine
        #   must be in to be shut down.
        def initialize(app, env, check, **opts)
          @app    = app
          @logger = Log4r::Logger.new("vagrant::action::builtin::is_state")
          @check  = check
          @invert = !!opts[:invert]
        end
        def call(env)
          @logger.debug("Checking if machine state is '#{@check}'")
          state = env[:machine].state.id
          @logger.debug("-- Machine state: #{state}")
          env[:result] = @check == state
          env[:result] = !env[:result] if @invert
          @app.call(env)
        end
      end
    end
  end
 end
 Vagrant::Action::Builtin.const_set :IsState, Vagrant::Backports::Action::IsState
--- a/lib/vagrant-backports/action/message.rb
+++ b/lib/vagrant-backports/action/message.rb
@ -0,0 +1,20 @@
 module Vagrant
  module Backports
    module Action
      # This middleware simply outputs a message to the UI.
      class Message
        def initialize(app, env, message, **opts)
          @app     = app
          @message = message
        end
        def call(env)
          env[:ui].info(@message)
          @app.call(env)
        end
      end
    end
  end
 end
 Vagrant::Action::Builtin.const_set :Message, Vagrant::Backports::Action::Message
--- a/lib/vagrant-backports/action/wait_for_communicator.rb
+++ b/lib/vagrant-backports/action/wait_for_communicator.rb
@ -0,0 +1,42 @@
 # This acts like a backport of Vagrant's built in action from 1.3+ for previous version
 #   https://github.com/mitchellh/vagrant/blob/master/lib/vagrant/action/builtin/wait_for_communicator.rb
 module Vagrant
  module Backports
    module Action
      class WaitForCommunicator
        def initialize(app, env)
          @app = app
        end
        def call(env)
          @env = env
          raise Vagrant::Errors::VMFailedToBoot if !wait_for_communicator
          @app.call env
        end
        def wait_for_communicator
          max_tries = @env[:machine].config.ssh.max_tries.to_i
          max_tries.times do |i|
            if @env[:machine].communicate.ready?
              @env[:ui].info 'Machine booted and ready!'
              return true
            end
            # Return true so that the vm_failed_to_boot error doesn't
            # get shown
            return true if @env[:interrupted]
            sleep 1 if !@env["vagrant.test"]
          end
          @env[:ui].error I18n.t("vagrant.actions.vm.boot.failed")
          false
        end
      end
    end
  end
 end
 Vagrant::Action::Builtin.const_set :WaitForCommunicator, Vagrant::Backports::Action::WaitForCommunicator
--- a/lib/vagrant-backports/ui.rb
+++ b/lib/vagrant-backports/ui.rb
@ -0,0 +1,12 @@
 module Vagrant
  module UI
    class Interface
      def output(*args)
        info(*args)
      end
      def detail(*args)
        info(*args)
      end
    end
  end
 end
--- a/lib/vagrant-backports/utils.rb
+++ b/lib/vagrant-backports/utils.rb
@ -0,0 +1,27 @@
 module Vagrant
  module Backports
    class << self
      def vagrant_1_2_or_later?
        greater_than?('1.2.0')
      end
      def vagrant_1_3_or_later?
        greater_than?('1.3.0')
      end
      def vagrant_1_4_or_later?
        greater_than?('1.4.0')
      end
      def vagrant_1_5_or_later?
        greater_than?('1.5.0')
      end
      private
      def greater_than?(version)
        Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new(version)
      end
    end
  end
 end
--- a/lib/vagrant-lxc/action.rb
+++ b/lib/vagrant-lxc/action.rb
@ -4,17 +4,27 @@ require 'vagrant-lxc/action/create'
 require 'vagrant-lxc/action/destroy'
 require 'vagrant-lxc/action/destroy_confirm'
 require 'vagrant-lxc/action/compress_rootfs'
-require 'vagrant-lxc/action/fetch_ip_with_lxc_info'
+require 'vagrant-lxc/action/fetch_ip_with_lxc_attach'
 require 'vagrant-lxc/action/fetch_ip_from_dnsmasq_leases'
 require 'vagrant-lxc/action/forced_halt'
 require 'vagrant-lxc/action/forward_ports'
 require 'vagrant-lxc/action/gc_private_network_bridges'
 require 'vagrant-lxc/action/handle_box_metadata'
 require 'vagrant-lxc/action/prepare_nfs_settings'
 require 'vagrant-lxc/action/prepare_nfs_valid_ids'
-require 'vagrant-lxc/action/private_networks'
+require 'vagrant-lxc/action/remove_temporary_files'
 require 'vagrant-lxc/action/setup_package_files'
 require 'vagrant-lxc/action/warn_networks'
 unless Vagrant::Backports.vagrant_1_3_or_later?
  require 'vagrant-backports/action/wait_for_communicator'
 end
 unless Vagrant::Backports.vagrant_1_5_or_later?
  require 'vagrant-backports/ui'
  require 'vagrant-backports/action/handle_box'
  require 'vagrant-backports/action/message'
  require 'vagrant-backports/action/is_state'
 end
 module Vagrant
  module LXC
    module Action
@ -47,14 +57,18 @@ module Vagrant
          b.use Builtin::Provision
          b.use Builtin::EnvSet, :port_collision_repair => true
          b.use Builtin::HandleForwardedPortCollisions
          if Vagrant::Backports.vagrant_1_4_or_later?
            b.use PrepareNFSValidIds
            b.use Builtin::SyncedFolderCleanup
            b.use Builtin::SyncedFolders
            b.use PrepareNFSSettings
          else
            require 'vagrant-lxc/backports/action/share_folders'
            b.use ShareFolders
          end
          b.use Builtin::SetHostname
          b.use WarnNetworks
          b.use ForwardPorts
          b.use PrivateNetworks
          b.use Boot
          b.use Builtin::WaitForCommunicator
        end
@ -87,7 +101,6 @@ module Vagrant
      def self.action_start
        Builder.new.tap do |b|
          b.use Builtin::ConfigValidate
          b.use Builtin::BoxCheckOutdated
          b.use Builtin::Call, Builtin::IsState, :running do |env, b2|
            # If the VM is running, then our work here is done, exit
            next if env[:result]
@ -124,7 +137,7 @@ module Vagrant
            end
            b2.use ClearForwardedPorts
-            b2.use GcPrivateNetworkBridges
+            b2.use RemoveTemporaryFiles
            b2.use Builtin::Call, Builtin::GracefulHalt, :stopped, :running do |env2, b3|
              if !env2[:result]
                b3.use ForcedHalt
@ -144,13 +157,16 @@ module Vagrant
              next
            end
            # TODO: Use Vagrant's built in action once we drop support for vagrant 1.2
            b2.use Builtin::Call, DestroyConfirm do |env2, b3|
              if env2[:result]
                b3.use Builtin::ConfigValidate
                b3.use Builtin::EnvSet, :force_halt => true
                b3.use action_halt
                b3.use Destroy
                if Vagrant::Backports.vagrant_1_3_or_later?
                  b3.use Builtin::ProvisionerCleanup
                end
              else
                b3.use Builtin::Message, I18n.t("vagrant_lxc.messages.will_not_destroy")
              end
@ -178,11 +194,11 @@ module Vagrant
      # This action is called to read the IP of the container. The IP found
      # is expected to be put into the `:machine_ip` key.
-      def self.action_ssh_ip
+      def self.action_fetch_ip
        Builder.new.tap do |b|
-          b.use Builtin::Call, Builtin::ConfigValidate do |env, b2|
+          b.use Builtin::ConfigValidate
-            b2.use FetchIpWithLxcInfo
+          b.use FetchIpWithLxcAttach
-          end
+          b.use FetchIpFromDnsmasqLeases
        end
      end
--- a/lib/vagrant-lxc/action/boot.rb
+++ b/lib/vagrant-lxc/action/boot.rb
@ -8,35 +8,14 @@ module Vagrant
        def call(env)
          @env = env
-          driver = env[:machine].provider.driver
+
          config = env[:machine].provider_config
          utsname = env[:machine].config.vm.hostname || env[:machine].id
          if driver.supports_new_config_format
            config.customize 'uts.name', utsname
          else
          config.customize 'utsname', utsname
          end
          # Fix apparmor issues when starting Ubuntu 14.04 containers
          # See https://github.com/fgrehm/vagrant-lxc/issues/278 for more information
          if Dir.exists?('/sys/fs/pstore')
            config.customize 'mount.entry', '/sys/fs/pstore sys/fs/pstore none bind,optional 0 0'
          end
          # Make selinux read-only, see
          # https://github.com/fgrehm/vagrant-lxc/issues/301
          if Dir.exists?('/sys/fs/selinux')
            config.customize 'mount.entry', '/sys/fs/selinux sys/fs/selinux none bind,ro 0 0'
          end
          if config.tmpfs_mount_size && !config.tmpfs_mount_size.empty?
            # Make /tmp a tmpfs to prevent init scripts from nuking synced folders mounted in here
            config.customize 'mount.entry', "tmpfs tmp tmpfs nodev,nosuid,size=#{config.tmpfs_mount_size} 0 0"
          end
          env[:ui].info I18n.t("vagrant_lxc.messages.starting")
-          driver.start(config.customizations)
+          env[:machine].provider.driver.start(config.customizations)
          @app.call env
        end
--- a/lib/vagrant-lxc/action/clear_forwarded_ports.rb
+++ b/lib/vagrant-lxc/action/clear_forwarded_ports.rb
@ -13,13 +13,9 @@ module Vagrant
          if redir_pids.any?
            env[:ui].info I18n.t("vagrant.actions.vm.clear_forward_ports.deleting")
            redir_pids.each do |pid|
-              next unless is_redir_pid?(pid[0])
+              next unless is_redir_pid?(pid)
-              @logger.debug "Killing pid #{pid[0]}"
+              @logger.debug "Killing pid #{pid}"
-              if pid[1]
+              system "pkill -TERM -P #{pid}"
                system "sudo pkill -TERM -P #{pid[0]}"
              else
                system "pkill -TERM -P #{pid[0]}"
              end
            end
            @logger.info "Removing redir pids files"
@ -35,8 +31,7 @@ module Vagrant
        def redir_pids
          @redir_pids = Dir[@env[:machine].data_dir.join('pids').to_s + "/redir_*.pid"].map do |file|
-            port_number = File.basename(file).split(/[^\d]/).join
+            File.read(file).strip.chomp
            [ File.read(file).strip.chomp , Integer(port_number) <= 1024 ]
          end
        end
--- a/lib/vagrant-lxc/action/create.rb
+++ b/lib/vagrant-lxc/action/create.rb
@ -7,8 +7,7 @@ module Vagrant
        end
        def call(env)
-          config = env[:machine].provider_config
+          container_name = env[:machine].provider_config.container_name
          container_name = config.container_name
          case container_name
            when :machine
@ -16,49 +15,24 @@ module Vagrant
            when String
              # Nothing to do here, move along...
            else
-              container_name = generate_container_name(env)
+              container_name = "#{env[:root_path].basename}_#{env[:machine].name}"
              container_name.gsub!(/[^-a-z0-9_]/i, "")
              # milliseconds + random number suffix to allow for simultaneous
              # `vagrant up` of the same box in different dirs
              container_name << "_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
          end
-          backingstore = config.backingstore
+          env[:machine].provider.driver.create(
          if backingstore.nil?
            backingstore = config.privileged ? "best" : "dir"
          end
          driver = env[:machine].provider.driver
          template_options = env[:lxc_template_opts]
          if driver.supports_new_config_format
            if env[:lxc_box_config]
              driver.update_config_keys(env[:lxc_box_config])
            end
          else
            template_options['--oldconfig'] = ''
          end
          driver.create(
            container_name,
            backingstore,
            config.backingstore_options,
            env[:lxc_template_src],
            env[:lxc_template_config],
-            template_options
+            env[:lxc_template_opts]
          )
          driver.update_config_keys
          env[:machine].id = container_name
          @app.call env
        end
        def generate_container_name(env)
          container_name = "#{env[:root_path].basename}_#{env[:machine].name}"
          container_name.gsub!(/[^-a-z0-9_]/i, "")
          # milliseconds + random number suffix to allow for simultaneous
          # `vagrant up` of the same box in different dirs
          container_name << "_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
          # Trim container name to 64 chars, keeping "randomness"
          trim_point = container_name.size > 64 ? -64 : -(container_name.size)
          container_name[trim_point..-1]
        end
      end
    end
  end
--- a/lib/vagrant-lxc/action/fetch_ip_from_dnsmasq_leases.rb
+++ b/lib/vagrant-lxc/action/fetch_ip_from_dnsmasq_leases.rb
@ -0,0 +1,49 @@
 module Vagrant
  module LXC
    module Action
      class FetchIpFromDnsmasqLeases
        def initialize(app, env)
          @app    = app
          @logger = Log4r::Logger.new("vagrant::lxc::action::fetch_ip_from_dnsmasq_leases")
        end
        def call(env)
          env[:machine_ip] ||= assigned_ip(env)
          @app.call(env)
        end
        def assigned_ip(env)
          mac_address = env[:machine].provider.driver.mac_address
          ip = nil
          10.times do
            dnsmasq_leases = read_dnsmasq_leases
            @logger.debug "Attempting to load ip from dnsmasq leases (mac: #{mac_address})"
            @logger.debug dnsmasq_leases
            if dnsmasq_leases =~ /#{Regexp.escape mac_address}\s+([0-9.]+)\s+/
              ip = $1.to_s
              break
            else
              @logger.debug 'Ip could not be parsed from dnsmasq leases file'
              sleep 2
            end
          end
          ip
        end
        LEASES_PATHS = %w(
          /var/lib/misc/dnsmasq.*.leases
          /var/lib/misc/dnsmasq.leases
          /var/lib/dnsmasq/dnsmasq.leases
          /var/db/dnsmasq.leases
          /var/lib/libvirt/dnsmasq/*.leases
        )
        def read_dnsmasq_leases
          Dir["{#{LEASES_PATHS.join(',')}}"].map do |file|
            File.read(file)
          end.join("\n")
        end
      end
    end
  end
 end
--- a/lib/vagrant-lxc/action/fetch_ip_with_lxc_attach.rb
+++ b/lib/vagrant-lxc/action/fetch_ip_with_lxc_attach.rb
@ -1,31 +1,30 @@
 module Vagrant
  module LXC
    module Action
-      class FetchIpWithLxcInfo
+      class FetchIpWithLxcAttach
        # Include this so we can use `Subprocess` more easily.
        include Vagrant::Util::Retryable
        def initialize(app, env)
          @app    = app
-          @logger = Log4r::Logger.new("vagrant::lxc::action::fetch_ip_with_lxc_info")
+          @logger = Log4r::Logger.new("vagrant::lxc::action::fetch_ip_with_lxc_attach")
        end
        def call(env)
          env[:machine_ip] ||= assigned_ip(env)
        rescue LXC::Errors::NamespacesNotSupported
          @logger.info 'The `lxc-attach` command available does not support the --namespaces parameter, falling back to dnsmasq leases to fetch container ip'
        ensure
          @app.call(env)
        end
        def assigned_ip(env)
          config = env[:machine].provider_config
          fetch_ip_tries = config.fetch_ip_tries
          driver = env[:machine].provider.driver
          ip = ''
-          return config.ssh_ip_addr if not config.ssh_ip_addr.nil?
+          retryable(:on => LXC::Errors::ExecuteError, :tries => 10, :sleep => 3) do
          retryable(:on => LXC::Errors::ExecuteError, :tries => fetch_ip_tries, :sleep => 3) do
            unless ip = get_container_ip_from_ip_addr(driver)
              # retry
-              raise LXC::Errors::ExecuteError, :command => "lxc-info"
+              raise LXC::Errors::ExecuteError, :command => "lxc-attach"
            end
          end
          ip
@ -33,8 +32,8 @@ module Vagrant
        # From: https://github.com/lxc/lxc/blob/staging/src/python-lxc/lxc/__init__.py#L371-L385
        def get_container_ip_from_ip_addr(driver)
-          output = driver.info '-iH'
+          output = driver.attach '/sbin/ip', '-4', 'addr', 'show', 'scope', 'global', 'eth0', namespaces: 'network'
-          if output =~ /^([0-9.]+)/
+          if output =~ /^\s+inet ([0-9.]+)\/[0-9]+\s+/
            return $1.to_s
          end
        end
--- a/lib/vagrant-lxc/action/forward_ports.rb
+++ b/lib/vagrant-lxc/action/forward_ports.rb
@ -1,5 +1,3 @@
 require 'open3'
 module Vagrant
  module LXC
    module Action
@ -69,9 +67,7 @@ module Vagrant
            # TODO: Deprecate this behavior of "automagically" skipping ssh forwarded ports
            if type == :forwarded_port && options[:id] != 'ssh'
-              if options.fetch(:host_ip, '').to_s.strip.empty?
+              options.delete(:host_ip) if options.fetch(:host_ip, '').to_s.strip.empty?
                options[:host_ip] = '127.0.0.1'
              end
              mappings[options[:host]] = options
            end
          end
@ -80,18 +76,11 @@ module Vagrant
        end
        def redirect_port(host_ip, host_port, guest_ip, guest_port)
          if redir_version >= 3
            params = %W( -n #{host_ip}:#{host_port} #{guest_ip}:#{guest_port} )
          else
          params = %W( --lport=#{host_port} --caddr=#{guest_ip} --cport=#{guest_port} )
          params.unshift "--laddr=#{host_ip}" if host_ip
          end
          params << '--syslog' if ENV['REDIR_LOG']
          if host_port < 1024
            redir_cmd = "sudo redir #{params.join(' ')} 2>/dev/null"
          else
          redir_cmd = "redir #{params.join(' ')} 2>/dev/null"
-          end
+
          @logger.debug "Forwarding port with `#{redir_cmd}`"
          spawn redir_cmd
        end
@ -105,13 +94,6 @@ module Vagrant
          end
        end
        def redir_version
          stdout, stderr, _ = Open3.capture3 "redir --version"
          # For some weird reason redir printed version information in STDERR prior to 3.2
          version = stdout.empty? ? stderr : stdout
          version.split('.')[0].to_i
        end
        def redir_installed?
          system "which redir > /dev/null"
        end
--- a/lib/vagrant-lxc/action/gc_private_network_bridges.rb
+++ b/lib/vagrant-lxc/action/gc_private_network_bridges.rb
@ -1,47 +0,0 @@
 module Vagrant
  module LXC
    module Action
      class GcPrivateNetworkBridges
        def initialize(app, env)
          @app = app
        end
        def call(env)
          was_running = env[:machine].provider.state.id == :running
          # Continue execution, we need the container to be stopped
          @app.call(env)
          was_running = was_running && env[:machine].provider.state.id != :running
          if was_running && private_network_configured?(env[:machine].config)
            private_network_configured?(env[:machine].config)
            remove_bridges_that_are_not_in_use(env)
          end
        end
        def private_network_configured?(config)
          config.vm.networks.find do |type, _|
            type.to_sym == :private_network
          end
        end
        def remove_bridges_that_are_not_in_use(env)
          env[:machine].config.vm.networks.find do |type, config|
            next if type.to_sym != :private_network
            bridge = config.fetch(:lxc__bridge_name)
            driver = env[:machine].provider.driver
            if ! driver.bridge_is_in_use?(bridge)
              env[:ui].info I18n.t("vagrant_lxc.messages.remove_bridge", name: bridge)
              unless ['lxcbr0', 'virbr0'].include? bridge
                driver.remove_bridge(bridge)
              end
            end
          end
        end
      end
    end
  end
 end
--- a/lib/vagrant-lxc/action/handle_box_metadata.rb
+++ b/lib/vagrant-lxc/action/handle_box_metadata.rb
@ -33,10 +33,8 @@ module Vagrant
          end
          if template_config_file.exist?
            @env[:lxc_box_config] = template_config_file.to_s
            @env[:lxc_template_opts].merge!('--config' => template_config_file.to_s)
          elsif old_template_config_file.exist?
            @env[:lxc_box_config] = old_template_config_file.to_s
            @env[:lxc_template_config] = old_template_config_file.to_s
          end
--- a/lib/vagrant-lxc/action/message.rb
+++ b/lib/vagrant-lxc/action/message.rb
--- a/lib/vagrant-lxc/action/private_networks.rb
+++ b/lib/vagrant-lxc/action/private_networks.rb
@ -1,46 +0,0 @@
 module Vagrant
  module LXC
    module Action
      class PrivateNetworks
        def initialize(app, env)
          @app = app
        end
        def call(env)
          @app.call(env)
          if private_network_configured?(env[:machine].config)
            env[:ui].output(I18n.t("vagrant_lxc.messages.setup_private_network"))
            configure_private_networks(env)
          end
        end
        def private_network_configured?(config)
          config.vm.networks.find do |type, _|
            type.to_sym == :private_network
          end
        end
        def configure_private_networks(env)
          env[:machine].config.vm.networks.find do |type, config|
            next if type.to_sym != :private_network
            container_name = env[:machine].provider.driver.container_name
            address_type   = config[:type]
            ip             = config[:ip]
            bridge_ip      = config.fetch(:lxc__bridge_ip) { build_bridge_ip(ip) }
            bridge         = config.fetch(:lxc__bridge_name)
            env[:machine].provider.driver.configure_private_network(bridge, bridge_ip, container_name, address_type, ip)
          end
        end
        def build_bridge_ip(ip)
          if ip
            ip.sub(/^(\d+\.\d+\.\d+)\.\d+/, '\1.254')
          end
        end
      end
    end
  end
 end
--- a/lib/vagrant-lxc/action/remove_temporary_files.rb
+++ b/lib/vagrant-lxc/action/remove_temporary_files.rb
@ -0,0 +1,23 @@
 module Vagrant
  module LXC
    module Action
      class RemoveTemporaryFiles
        def initialize(app, env)
          @app    = app
          @logger = Log4r::Logger.new("vagrant::lxc::action::remove_tmp_files")
        end
        def call(env)
          # Continue execution, we need the container to be stopped
          @app.call env
          if env[:machine].state.id == :stopped
            @logger.debug 'Removing temporary files'
            tmp_path = env[:machine].provider.driver.rootfs_path.join('tmp')
            env[:machine].provider.sudo_wrapper.run('rm', '-rf', "#{tmp_path}/*")
          end
        end
      end
    end
  end
 end
--- a/lib/vagrant-lxc/action/warn_networks.rb
+++ b/lib/vagrant-lxc/action/warn_networks.rb
@ -7,16 +7,16 @@ module Vagrant
        end
        def call(env)
-          if public_network_configured?(env[:machine].config)
+          if public_or_private_network_configured?(env[:machine].config)
            env[:ui].warn(I18n.t("vagrant_lxc.messages.warn_networks"))
          end
          @app.call(env)
        end
-        def public_network_configured?(config)
+        def public_or_private_network_configured?(config)
          config.vm.networks.find do |type, _|
-            type.to_sym == :public_network
+            [:private_network, :public_network].include?(type.to_sym)
          end
        end
      end
--- a/lib/vagrant-lxc/backports/action/share_folders.rb
+++ b/lib/vagrant-lxc/backports/action/share_folders.rb
@ -0,0 +1,67 @@
 module Vagrant
  module LXC
    module Action
      class ShareFolders
        def initialize(app, env)
          @app = app
        end
        def call(env)
          @env = env
          prepare_folders
          add_override_configs
          @app.call env
        end
        # This method returns an actual list of synced folders to create and their
        # proper path.
        def shared_folders
          {}.tap do |result|
            @env[:machine].config.vm.synced_folders.each do |id, data|
              # Ignore disabled shared folders
              next if data[:disabled]
              # This to prevent overwriting the actual shared folders data
              result[id] = data.dup
            end
          end
        end
        # Prepares the shared folders by verifying they exist and creating them
        # if they don't.
        def prepare_folders
          shared_folders.each do |id, options|
            hostpath = Pathname.new(options[:hostpath]).expand_path(@env[:root_path])
            if !hostpath.directory? && options[:create]
              # Host path doesn't exist, so let's create it.
              @logger.debug("Host path doesn't exist, creating: #{hostpath}")
              begin
                hostpath.mkpath
              rescue Errno::EACCES
                raise Vagrant::Errors::SharedFolderCreateFailed,
                  :path => hostpath.to_s
              end
            end
          end
        end
        def add_override_configs
          @env[:ui].info I18n.t("vagrant.actions.lxc.share_folders.preparing")
          folders = []
          shared_folders.each do |id, data|
            folders << {
              :name      => id,
              :hostpath  => File.expand_path(data[:hostpath], @env[:root_path]),
              :guestpath => data[:guestpath]
            }
            @env[:ui].info(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
                                  :guest_path => data[:guestpath]))
          end
          @env[:machine].provider.driver.share_folders(folders)
        end
      end
    end
  end
 end
--- a/lib/vagrant-lxc/command/sudoers.rb
+++ b/lib/vagrant-lxc/command/sudoers.rb
@ -1,26 +1,16 @@
 require 'tempfile'
 require "vagrant-lxc/driver"
 require "vagrant-lxc/sudo_wrapper"
 module Vagrant
  module LXC
    module Command
      class Sudoers < Vagrant.plugin("2", :command)
        def initialize(argv, env)
          super
          @argv
          @env = env
        end
        def execute
          options = { user: ENV['USER'] }
          opts = OptionParser.new do |opts|
            opts.banner = "Usage: vagrant lxc sudoers"
            opts.separator ""
-            opts.on('-u user', '--user user', String, "The user for which to create the policy (defaults to '#{options[:user]}')") do |u|
+            opts.on('-u', '--user', "The user for which to create the policy (defaults to '#{options[:user]}')") do |u|
              options[:user] = u
            end
          end
@ -28,68 +18,68 @@ module Vagrant
          argv = parse_options(opts)
          return unless argv
-          wrapper_path = SudoWrapper.dest_path
+          filename = "vagrant-lxc-#{options[:user]}"
-          wrapper = create_wrapper!
+          to_sudoers!(create_tempfile!(options[:user], filename), filename)
          sudoers = create_sudoers!(options[:user], wrapper_path)
          su_copy([
            {source: wrapper, target: wrapper_path, mode: "0555"},
            {source: sudoers, target: sudoers_path, mode: "0440"}
          ])
        end
        def sudoers_path
          "/etc/sudoers.d/vagrant-lxc"
        end
        private
-        # This requires vagrant 1.5.2+ https://github.com/mitchellh/vagrant/commit/3371c3716278071680af9b526ba19235c79c64cb
+        # REFACTOR: Make use ERB rendering after https://github.com/mitchellh/vagrant/issues/3231
-        def create_wrapper!
+        #           lands into core
-          lxc_base_path = Driver.new("").containers_path
+        def create_tempfile!(user, filename)
-          wrapper = Tempfile.new('lxc-wrapper').tap do |file|
+          sudoers = Tempfile.new(filename).tap do |file|
-            template = Vagrant::Util::TemplateRenderer.new(
+            file.write "# Automatically created by vagrant-lxc\n"
-              'sudoers.rb',
+            commands.each do |command|
-              :template_root  => Vagrant::LXC.source_root.join('templates').to_s,
+              file.write sudoers_policy(user, command[:cmd], command[:args])
              :cmd_paths      => build_cmd_paths_hash,
              :lxc_base_path  => lxc_base_path,
              :pipework_regex => "#{ENV['HOME']}/\.vagrant\.d/gems/(?:\\d+?\\.\\d+?\\.\\d+?/)?gems/vagrant-lxc.+/scripts/pipework"
            )
            file.puts template.render
            end
          wrapper.close
          wrapper.path
        end
        def create_sudoers!(user, command)
          sudoers = Tempfile.new('vagrant-lxc-sudoers').tap do |file|
            file.puts "# Automatically created by vagrant-lxc"
            file.puts "#{user} ALL=(root) NOPASSWD: #{command}"
          end
          sudoers.close
          File.chmod(0644, sudoers.path)
          sudoers.path
        end
-        def su_copy(files)
+        def to_sudoers!(source, destination)
-          commands = files.map { |file|
+          destination = "/etc/sudoers.d/#{destination}"
-            [
+          commands = [
-              "rm -f #{file[:target]}",
+            "rm -f #{destination}",
-              "cp #{file[:source]} #{file[:target]}",
+            "cp #{source} #{destination}",
-              "chown root:root #{file[:target]}",
+            "chmod 440 #{destination}"
              "chmod #{file[:mode]} #{file[:target]}"
          ]
-          }.flatten
+          `echo "#{commands.join('; ')}" | sudo sh`
          system "echo \"#{commands.join("; ")}\" | sudo sh"
        end
-        def build_cmd_paths_hash
+        def sudoers_policy(user, command, args)
-          {}.tap do |hash|
+          vagrant_home = "#{`echo ~#{user}`.chomp}/.vagrant.d"
-            %w( which cat mkdir cp chown chmod rm tar chown ip ifconfig brctl ).each do |cmd|
+          args = args.gsub /%\{VAGRANT_D\}/, vagrant_home
-              hash[cmd] = `sudo which #{cmd}`.strip
+          args = args.gsub /%\{BOXES\}/, "#{vagrant_home}/boxes"
-            end
+          "#{user} ALL=(root) NOPASSWD: #{command} #{args}\n"
            hash['lxc_bin'] = Pathname(`sudo which lxc-create`.strip).parent.to_s
            hash['ruby'] = Gem.ruby
        end
        def commands
         [
           { cmd: '/usr/bin/lxc-ls',        args: '' },
           { cmd: '/usr/bin/lxc-info',      args: '' },
           { cmd: '/usr/bin/lxc-attach',    args: '' },
           { cmd: '/usr/bin/which',         args: 'lxc-*' },
           { cmd: '/bin/cat',               args: '/var/lib/lxc/*' },
           { cmd: '/bin/mkdir',             args: '-p /var/lib/lxc/*' },
           { cmd: '/bin/su',                args: "root -c sed -e '*' -ibak /var/lib/lxc/*" },
           { cmd: '/bin/su',                args: "root -c echo '*' >> /var/lib/lxc/*" },
           { cmd: '/usr/bin/lxc-start',     args: '-d --name *' },
           { cmd: '/bin/cp',                args: '%{BOXES}/*/lxc/lxc-template /usr/lib/lxc/templates/*' },
           { cmd: '/bin/cp',                args: '%{VAGRANT_D}/gems/gems/vagrant-lxc-*/scripts/lxc-template /usr/lib/lxc/templates/*' },
           { cmd: '/bin/cp',                args: '%{BOXES}/*/lxc/lxc-template /usr/share/lxc/templates/*' },
           { cmd: '/bin/cp',                args: '%{VAGRANT_D}/gems/gems/vagrant-lxc-*/scripts/lxc-template /usr/share/lxc/templates/*' },
           { cmd: '/bin/rm',                args: '/usr/lib/lxc/templates/*' },
           { cmd: '/bin/rm',                args: '/usr/share/lxc/templates/*' },
           { cmd: '/bin/chmod',             args: '+x /usr/lib/lxc/*' },
           { cmd: '/bin/chmod',             args: '+x /usr/share/lxc/*' },
           { cmd: '/usr/bin/lxc-create',    args: '--template * --name * -- --tarball %{BOXES}/*' },
           { cmd: '/bin/rm',                args: '-rf /var/lib/lxc/*/rootfs/tmp/*' },
           { cmd: '/usr/bin/lxc-shutdown',  args: '--name *' },
           { cmd: '/usr/bin/lxc-stop',      args: '--name *' },
           { cmd: '/usr/bin/lxc-destroy',   args: '--name *' }
         ]
        end
      end
    end
--- a/lib/vagrant-lxc/config.rb
+++ b/lib/vagrant-lxc/config.rb
@ -6,41 +6,20 @@ module Vagrant
      # @return [Array]
      attr_reader :customizations
-      # A string that contains the backing store type used with lxc-create -B
+      # A String that points to a file that acts as a wrapper for sudo commands.
      attr_accessor :backingstore
      # Optional arguments for the backing store, such as --fssize, --fstype, ...
      #
-      # @return [Array]
+      # This allows us to have a single entry when whitelisting NOPASSWD commands
-      attr_accessor :backingstore_options
+      # on /etc/sudoers
      attr_accessor :sudo_wrapper
      # A string to explicitly set the container name. To use the vagrant
      # machine name, set this to :machine
      attr_accessor :container_name
      # Size (as a string like '400M') of the tmpfs to mount at /tmp on boot.
      # Set to false or nil to disable the tmpfs mount altogether. Defaults to '2G'.
      attr_accessor :tmpfs_mount_size
      attr_accessor :fetch_ip_tries
      attr_accessor :ssh_ip_addr
      # Whether the container needs to be privileged. Defaults to true (unprivileged containers
      # is a very new feature in vagrant-lxc). If false, will try creating an unprivileged
      # container. If it can't, will revert to the old "sudo wrapper" method to create a privileged
      # container.
      attr_accessor :privileged
      def initialize
        @customizations = []
-        @backingstore = UNSET_VALUE
+        @sudo_wrapper   = UNSET_VALUE
        @backingstore_options = []
        @container_name = UNSET_VALUE
        @tmpfs_mount_size = UNSET_VALUE
        @fetch_ip_tries = UNSET_VALUE
        @ssh_ip_addr = UNSET_VALUE
        @privileged = UNSET_VALUE
      end
      # Customize the container by calling `lxc-start` with the given
@ -58,19 +37,24 @@ module Vagrant
        @customizations << [key, value]
      end
-      # Stores options for backingstores like lvm, btrfs, etc
+      def finalize!
-      def backingstore_option(key, value)
+        @sudo_wrapper = nil if @sudo_wrapper == UNSET_VALUE
-        @backingstore_options << [key, value]
+        @container_name = nil if @container_name == UNSET_VALUE
      end
-      def finalize!
+      def validate(machine)
-        @container_name = nil if @container_name == UNSET_VALUE
+        errors = []
-        @backingstore = nil if @backingstore == UNSET_VALUE
+
-        @existing_container_name = nil if @existing_container_name == UNSET_VALUE
+        if @sudo_wrapper
-        @tmpfs_mount_size = '2G' if @tmpfs_mount_size == UNSET_VALUE
+          hostpath = Pathname.new(@sudo_wrapper).expand_path(machine.env.root_path)
-        @fetch_ip_tries = 10 if @fetch_ip_tries == UNSET_VALUE
+          if ! hostpath.file?
-        @ssh_ip_addr = nil if @ssh_ip_addr == UNSET_VALUE
+            errors << I18n.t('vagrant_lxc.sudo_wrapper_not_found', path: hostpath.to_s)
-        @privileged = true if @privileged == UNSET_VALUE
+          elsif ! hostpath.executable?
            errors << I18n.t('vagrant_lxc.sudo_wrapper_not_executable', path: hostpath.to_s)
          end
        end
        { "lxc provider" => errors }
      end
    end
  end
--- a/lib/vagrant-lxc/driver.rb
+++ b/lib/vagrant-lxc/driver.rb
@ -3,12 +3,9 @@ require "vagrant/util/subprocess"
 require "vagrant-lxc/errors"
 require "vagrant-lxc/driver/cli"
 require "vagrant-lxc/sudo_wrapper"
 require "etc"
 require "tempfile"
 module Vagrant
  module LXC
    class Driver
@ -16,14 +13,16 @@ module Vagrant
      # a name.
      class ContainerNotFound < StandardError; end
-      # Default root folder where container configs are stored
+      # Root folder where container configs are stored
      CONTAINERS_PATH = '/var/lib/lxc'
      attr_reader :container_name,
                  :customizations
-      def initialize(container_name, sudo_wrapper = nil, cli = nil, privileged: true)
+      def initialize(container_name, sudo_wrapper, cli = nil)
        @container_name = container_name
-        @sudo_wrapper   = sudo_wrapper || SudoWrapper.new(privileged: privileged)
+        @sudo_wrapper   = sudo_wrapper
-        @cli            = cli || CLI.new(@sudo_wrapper, container_name)
+        @cli            = cli || CLI.new(sudo_wrapper, container_name)
        @logger         = Log4r::Logger.new("vagrant::provider::lxc::driver")
        @customizations = []
      end
@ -32,71 +31,53 @@ module Vagrant
        raise ContainerNotFound if @container_name && ! @cli.list.include?(@container_name)
      end
      # Root folder where container configs are stored
      def containers_path
        @containers_path ||= @cli.config('lxc.lxcpath')
      end
      def all_containers
        @cli.list
      end
      def base_path
-        Pathname.new("#{containers_path}/#{@container_name}")
+        Pathname.new("#{CONTAINERS_PATH}/#{@container_name}")
      end
      def config_path
        base_path.join('config').to_s
      end
      def rootfs_path
-        pathtype, path = config_string.match(/^lxc\.rootfs(?:\.path)?\s+=\s+(.+:)?(.+)$/)[1..2]
+        Pathname.new(config_string.match(/^lxc\.rootfs\s+=\s+(.+)$/)[1])
        case pathtype
        when 'overlayfs:'
          # Split on colon (:), ignoring any colon escaped by an escape character ( \ )
          # Pays attention to when the escape character is itself escaped.
          _, overlay_path = config_entry.split(/(?<!\\)(?:\\\\)*:/)
          if overlay_path
            Pathname.new(overlay_path)
          else
            # Malformed: fall back to prior behaviour
            Pathname.new(path)
          end
        else
          Pathname.new(path)
        end
      end
      def mac_address
-        return @mac_address if @mac_address
+        @mac_address ||= config_string.match(/^lxc\.network\.hwaddr\s*+=\s*+(.+)$/)[1]
        if config_string =~ /^lxc\.network\.hwaddr\s*+=\s*+(.+)$/
          @mac_address = $1
        end
      end
      def config_string
-        @sudo_wrapper.run('cat', config_path)
+        @sudo_wrapper.run('cat', base_path.join('config').to_s)
      end
-      def create(name, backingstore, backingstore_options, template_path, config_file, template_options = {})
+      def create(name, template_path, config_file, template_options = {})
        @cli.name = @container_name = name
        import_template(template_path) do |template_name|
          @logger.debug "Creating container..."
-
+          @cli.create template_name, config_file, template_options
-        @cli.create template_path, backingstore, backingstore_options, config_file, template_options
+        end
      end
      def share_folders(folders)
        folders.each do |f|
-          share_folder(f[:hostpath], f[:guestpath], f.fetch(:mount_options, nil))
+          share_folder(f[:hostpath], f[:guestpath], f.fetch(:mount_options, 'bind'))
        end
      end
      def share_folder(host_path, guest_path, mount_options = nil)
-        guest_path    = guest_path.gsub(/^\//, '').gsub(' ', '\\\040')
+        guest_path = rootfs_path.join(guest_path.gsub(/^\//, ''))
-        mount_options = Array(mount_options || ['bind', 'create=dir'])
+        unless guest_path.directory?
-        host_path     = host_path.to_s.gsub(' ', '\\\040')
+          begin
            @logger.debug("Guest path doesn't exist, creating: #{guest_path}")
            @sudo_wrapper.run('mkdir', '-p', guest_path.to_s)
          rescue Errno::EACCES
            raise Vagrant::Errors::SharedFolderCreateFailed, :path => guest_path.to_s
          end
        end
        mount_options = Array(mount_options || ['bind'])
        @customizations << ['mount.entry', "#{host_path} #{guest_path} none #{mount_options.join(',')} 0 0"]
      end
@ -115,6 +96,10 @@ module Vagrant
      def forced_halt
        @logger.info('Shutting down container...')
        # TODO: Remove `lxc-shutdown` usage, graceful halt is enough
        @cli.transition_to(:stopped) { |c| c.shutdown }
      # REFACTOR: Do not use exception to control the flow
      rescue CLI::TargetStateNotReached, CLI::ShutdownNotSupported
        @cli.transition_to(:stopped) { |c| c.stop }
      end
@ -126,103 +111,27 @@ module Vagrant
        @cli.attach(*command)
      end
      def info(*command)
        @cli.info(*command)
      end
      def configure_private_network(bridge_name, bridge_ip, container_name, address_type, ip)
        @logger.info "Configuring network interface for #{container_name} using #{ip} and bridge #{bridge_name}"
        if ip
          ip += '/24'
        end
        if ! bridge_exists?(bridge_name)
          if not bridge_ip
            raise "Bridge is missing and no IP was specified!"
          end
          @logger.info "Creating the bridge #{bridge_name}"
          cmd = [
            'brctl',
            'addbr',
            bridge_name
          ]
          @sudo_wrapper.run(*cmd)
        end
        if ! bridge_has_an_ip?(bridge_name)
          if not bridge_ip
            raise "Bridge has no IP and none was specified!"
          end
          @logger.info "Adding #{bridge_ip} to the bridge #{bridge_name}"
          cmd = [
            'ip',
            'addr',
            'add',
            "#{bridge_ip}/24",
            'dev',
            bridge_name
          ]
          @sudo_wrapper.run(*cmd)
          @sudo_wrapper.run('ip', 'link', 'set', bridge_name, 'up')
        end
        cmd = [
          Vagrant::LXC.source_root.join('scripts/pipework').to_s,
          bridge_name,
          container_name,
          ip ||= "dhcp"
        ]
        @sudo_wrapper.run(*cmd)
      end
      def bridge_has_an_ip?(bridge_name)
        @logger.info "Checking whether the bridge #{bridge_name} has an IP"
        `ip -4 addr show scope global #{bridge_name}` =~ /^\s+inet ([0-9.]+)\/[0-9]+\s+/
      end
      def bridge_exists?(bridge_name)
        @logger.info "Checking whether bridge #{bridge_name} exists"
        brctl_output = `ip link | egrep -q " #{bridge_name}:"`
        $?.to_i == 0
      end
      def bridge_is_in_use?(bridge_name)
        # REFACTOR: This method is **VERY** hacky
        @logger.info "Checking if bridge #{bridge_name} is in use"
        brctl_output = `brctl show #{bridge_name} 2>/dev/null | tail -n +2 | grep -q veth`
        $?.to_i == 0
      end
      def remove_bridge(bridge_name)
        if ['lxcbr0', 'virbr0'].include? bridge_name
           @logger.info "Skipping removal of system bridge #{bridge_name}"
           return
        end
        return unless bridge_exists?(bridge_name)
        @logger.info "Removing bridge #{bridge_name}"
        @sudo_wrapper.run('ip', 'link', 'set', bridge_name, 'down')
        @sudo_wrapper.run('brctl', 'delbr', bridge_name)
      end
      def version
        @version ||= @cli.version
      end
      def supports_new_config_format
        Gem::Version.new(version) >= Gem::Version.new('2.1.0')
      end
      # TODO: This needs to be reviewed and specs needs to be written
      def compress_rootfs
        # TODO: Pass in tmpdir so we can clean up from outside
        target_path    = "#{Dir.mktmpdir}/rootfs.tar.gz"
        @logger.info "Compressing '#{rootfs_path}' rootfs to #{target_path}"
-        @sudo_wrapper.run('tar', '--numeric-owner', '-cvzf', target_path, '-C',
+        # "vagrant package" will copy the existing lxc-template in the new box file
-          rootfs_path.parent.to_s, "./#{rootfs_path.basename.to_s}")
+        # To keep this function backwards compatible with existing boxes, the path
        # included in the tarball needs to have the same amount of path components (2)
        # that will be stripped before extraction, hence the './.'
        # TODO: This should be reviewed before 1.0
        cmds = [
          "cd #{base_path}",
          "rm -f rootfs.tar.gz",
          "tar --numeric-owner -czf #{target_path} -C #{rootfs_path} './.'"
        ]
        @sudo_wrapper.su_c(cmds.join(' && '))
        @logger.info "Changing rootfs tarball owner"
        user_details = Etc.getpwnam(Etc.getlogin)
@ -240,16 +149,7 @@ module Vagrant
      def prune_customizations
        # Use sed to just strip out the block of code which was inserted by Vagrant
        @logger.debug 'Prunning vagrant-lxc customizations'
-        contents = config_string
+        @sudo_wrapper.su_c("sed -e '/^# VAGRANT-BEGIN/,/^# VAGRANT-END/ d' -ibak #{base_path.join('config')}")
        contents.gsub! /^# VAGRANT-BEGIN(.|\s)*# VAGRANT-END\n/, ''
        write_config(contents)
      end
      def update_config_keys(path = nil)
        path = path || config_path
        @cli.update_config(path)
      rescue Errors::ExecuteError
        # not on LXC 2.1+. Doesn't matter, ignore.
      end
      protected
@ -259,31 +159,45 @@ module Vagrant
          "lxc.#{key}=#{value}"
        end
        customizations.unshift '# VAGRANT-BEGIN'
-        customizations      << "# VAGRANT-END\n"
+        customizations      << '# VAGRANT-END'
-        contents = config_string
+        config_file = base_path.join('config').to_s
-        contents << customizations.join("\n")
+        customizations.each do |line|
-
+          @sudo_wrapper.su_c("echo '#{line}' >> #{config_file}")
-        write_config(contents)
+        end
      end
-      def write_config(contents)
+      def import_template(path)
-        confpath = base_path.join('config').to_s
+        template_name     = "vagrant-tmp-#{@container_name}"
-        begin
+        tmp_template_path = templates_path.join("lxc-#{template_name}").to_s
-          File.open(confpath, File::RDWR) do |file|
+
-            file.write contents
+        @logger.info 'Copying LXC template into place'
-          end
+        @sudo_wrapper.run('cp', path, tmp_template_path)
-        rescue
+        @sudo_wrapper.run('chmod', '+x', tmp_template_path)
-          # We don't have permissions to write in the conf file. That's probably because it's a
+
-          # privileged container. Work around that through sudo_wrapper.
+        yield template_name
-          Tempfile.new('lxc-config').tap do |file|
+      ensure
-            file.chmod 0644
+        @logger.info 'Removing LXC template'
-            file.write contents
+        if tmp_template_path
-            file.close
+          @sudo_wrapper.run('rm', tmp_template_path)
            @sudo_wrapper.run 'cp', '-f', file.path, confpath
            @sudo_wrapper.run 'chown', 'root:root', confpath
        end
      end
      TEMPLATES_PATH_LOOKUP = %w(
        /usr/share/lxc/templates
        /usr/lib/lxc/templates
        /usr/lib64/lxc/templates
        /usr/local/lib/lxc/templates
      )
      def templates_path
        return @templates_path if @templates_path
        path = TEMPLATES_PATH_LOOKUP.find { |candidate| File.directory?(candidate) }
        if !path
          raise Errors::TemplatesDirMissing.new paths: TEMPLATES_PATH_LOOKUP.inspect
        end
        @templates_path = Pathname(path)
      end
    end
  end
--- a/lib/vagrant-lxc/driver/cli.rb
+++ b/lib/vagrant-lxc/driver/cli.rb
@ -10,6 +10,7 @@ module Vagrant
        attr_accessor :name
        class TransitionBlockNotProvided < RuntimeError; end
        class ShutdownNotSupported < RuntimeError; end
        class TargetStateNotReached < RuntimeError
          def initialize(target_state, state)
            msg = "Target state '#{target_state}' not reached, currently on '#{state}'"
@ -28,24 +29,14 @@ module Vagrant
        end
        def version
-          return @version if @version
+          if run(:version) =~ /lxc version:\s+(.+)\s*$/
-          @version = run(:create, '--version')
+            $1.downcase
          if @version =~ /(lxc version:\s+|)(.+)\s*$/
            @version = $2.downcase
          else
            # TODO: Raise an user friendly error
            raise 'Unable to parse lxc version!'
          end
        end
        def config(param)
          run(:config, param).gsub("\n", '')
        end
        def update_config(path)
          run('update-config', '-c', path)
        end
        def state
          if @name && run(:info, '--name', @name, retryable: true) =~ /^state:[^A-Z]+([A-Z]+)$/i
            $1.downcase.to_sym
@ -54,19 +45,17 @@ module Vagrant
          end
        end
-        def create(template, backingstore, backingstore_options, config_file, template_opts = {})
+        def create(template, config_file, template_opts = {})
          if config_file
            config_opts = ['-f', config_file]
          end
-          extra = template_opts.to_a.flatten.reject { |elem| elem.empty? }
+          extra = template_opts.to_a.flatten
          extra.unshift '--' unless extra.empty?
          run :create,
              '-B', backingstore,
              '--template', template,
              '--name',     @name,
              *(backingstore_options.to_a.flatten),
              *(config_opts),
              *extra
        rescue Errors::ExecuteError => e
@ -85,18 +74,17 @@ module Vagrant
          run :start, '-d', '--name', @name, *Array(options)
        end
        ## lxc-stop will exit 2 if machine was already stopped
        # Man Page:
        # 2      The specified container exists but was not running.
        def stop
-          begin
+          attach '/sbin/halt'
          run :stop, '--name', @name
          rescue LXC::Errors::ExecuteError => e
            if e.exitcode == 2
              @logger.debug "Machine already stopped, lxc-stop returned 2"
            else
              raise e
        end
        def shutdown
          if system('which lxc-shutdown > /dev/null')
            run :shutdown, '--name', @name
          else
            # REFACTOR: Do not use exception to control the flow
            raise ShutdownNotSupported
          end
        end
@ -107,23 +95,18 @@ module Vagrant
            opts       = cmd.pop
            namespaces = Array(opts[:namespaces]).map(&:upcase).join('|')
            # HACK: The wrapper script should be able to handle this
            if @sudo_wrapper.wrapper_path
              namespaces = "'#{namespaces}'"
            end
            if namespaces
              if supports_attach_with_namespaces?
                extra = ['--namespaces', namespaces]
              else
                raise LXC::Errors::NamespacesNotSupported
              end
            end
          end
          run :attach, '--name', @name, *((extra || []) + cmd)
        end
        def info(*cmd)
          run(:info, '--name', @name, *cmd)
        end
        def transition_to(target_state, tries = 30, timeout = 1, &block)
          raise TransitionBlockNotProvided unless block_given?
@ -146,6 +129,14 @@ module Vagrant
        def run(command, *args)
          @sudo_wrapper.run("lxc-#{command}", *args)
        end
        def supports_attach_with_namespaces?
          unless defined?(@supports_attach_with_namespaces)
            @supports_attach_with_namespaces = run(:attach, '-h', :show_stderr => true).values.join.include?('--namespaces')
          end
          return @supports_attach_with_namespaces
        end
      end
    end
  end
--- a/lib/vagrant-lxc/errors.rb
+++ b/lib/vagrant-lxc/errors.rb
@ -5,28 +5,17 @@ module Vagrant
    module Errors
      class ExecuteError < Vagrant::Errors::VagrantError
        error_key(:lxc_execute_error)
-        attr_reader :stderr, :stdout, :exitcode
+        attr_reader :stderr, :stdout
        def initialize(message, *args)
          super
          if message.is_a?(Hash)
            @stderr = message[:stderr]
            @stdout = message[:stdout]
            @exitcode = message[:exitcode]
          end
        end
      end
-      # Raised when user interrupts a subprocess
+      class NamespacesNotSupported < Vagrant::Errors::VagrantError
      class SubprocessInterruptError < Vagrant::Errors::VagrantError
        error_key(:lxc_interrupt_error)
        def initialize(message, *args)
          super
        end
      end
      class LxcLinuxRequired < Vagrant::Errors::VagrantError
        error_key(:lxc_linux_required)
      end
      class LxcNotInstalled < Vagrant::Errors::VagrantError
@ -37,10 +26,6 @@ module Vagrant
        error_key(:lxc_container_already_exists)
      end
      class CommandNotSupported < Vagrant::Errors::VagrantError
        error_key(:lxc_command_not_supported)
      end
      # Box related errors
      class TemplateFileMissing < Vagrant::Errors::VagrantError
        error_key(:lxc_template_file_missing)
--- a/lib/vagrant-lxc/plugin.rb
+++ b/lib/vagrant-lxc/plugin.rb
@ -1,4 +1,5 @@
 require 'vagrant'
 require 'vagrant-backports/utils'
 module Vagrant
  module LXC
@ -9,43 +10,40 @@ module Vagrant
      LXC-based virtual machines.
      EOF
-      provider(:lxc, parallel: true, priority: 7) do
+      extra = []
-        require_relative 'provider'
+      extra << {parallel: true} if Vagrant::Backports.vagrant_1_2_or_later?
-        init!
+      provider(:lxc, *extra) do
        require File.expand_path("../provider", __FILE__)
        I18n.load_path << File.expand_path(File.dirname(__FILE__) + '/../../locales/en.yml')
        I18n.reload!
        Provider
      end
      command "lxc" do
        require_relative 'command/root'
        init!
        Command::Root
      end
      config(:lxc, :provider) do
-        require_relative 'config'
+        require File.expand_path("../config", __FILE__)
        init!
        Config
      end
      if Vagrant::Backports.vagrant_1_4_or_later?
        synced_folder(:lxc) do
-        require_relative 'synced_folder'
+          require File.expand_path("../synced_folder", __FILE__)
          SyncedFolder
        end
      end
      if Vagrant::Backports.vagrant_1_5_or_later?
        provider_capability("lxc", "public_address") do
          require_relative "provider/cap/public_address"
          Provider::Cap::PublicAddress
        end
      protected
      def self.init!
        return if defined?(@_init)
        I18n.load_path << File.expand_path(File.dirname(__FILE__) + '/../../locales/en.yml')
        I18n.reload!
        @_init = true
      end
    end
  end
 end
--- a/lib/vagrant-lxc/provider.rb
+++ b/lib/vagrant-lxc/provider.rb
@ -2,20 +2,13 @@ require "log4r"
 require "vagrant-lxc/action"
 require "vagrant-lxc/driver"
 require "vagrant-lxc/sudo_wrapper"
 module Vagrant
  module LXC
    class Provider < Vagrant.plugin("2", :provider)
      attr_reader :driver
      def self.usable?(raise_error=false)
        if !Vagrant::Util::Platform.linux?
          raise Errors::LxcLinuxRequired
        end
        true
      end
      def initialize(machine)
        @logger    = Log4r::Logger.new("vagrant::provider::lxc")
        @machine   = machine
@ -24,9 +17,17 @@ module Vagrant
        machine_id_changed
      end
      def sudo_wrapper
        @shell ||= begin
          wrapper = @machine.provider_config.sudo_wrapper
          wrapper = Pathname(wrapper).expand_path(@machine.env.root_path).to_s if wrapper
          SudoWrapper.new(wrapper)
        end
      end
      def ensure_lxc_installed!
        begin
-          SudoWrapper.new(privileged: @machine.provider_config.privileged).run("which", "lxc-create")
+          sudo_wrapper.run("which", "lxc-create")
        rescue Vagrant::LXC::Errors::ExecuteError
          raise Errors::LxcNotInstalled
        end
@ -39,7 +40,7 @@ module Vagrant
        begin
          @logger.debug("Instantiating the container for: #{id.inspect}")
-          @driver = Driver.new(id, privileged: @machine.provider_config.privileged)
+          @driver = Driver.new(id, self.sudo_wrapper)
          @driver.validate!
        rescue Driver::ContainerNotFound
          # The container doesn't exist, so we probably have a stale
@ -62,13 +63,13 @@ module Vagrant
      # Returns the SSH info for accessing the Container.
      def ssh_info
-        # If the Container is not running then we cannot possibly SSH into it, so
+        # If the Container is not created then we cannot possibly SSH into it, so
        # we return nil.
-        return nil if state.id != :running
+        return nil if state == :not_created
-        # Run a custom action called "ssh_ip" which does what it says and puts
+        # Run a custom action called "fetch_ip" which does what it says and puts
        # the IP found into the `:machine_ip` key in the environment.
-        env = @machine.action("ssh_ip")
+        env = @machine.action("fetch_ip")
        # If we were not able to identify the container's IP, we return nil
        # here and we let Vagrant core deal with it ;)
--- a/lib/vagrant-lxc/sudo_wrapper.rb
+++ b/lib/vagrant-lxc/sudo_wrapper.rb
@ -4,43 +4,24 @@ module Vagrant
      # Include this so we can use `Subprocess` more easily.
      include Vagrant::Util::Retryable
-      attr_reader :wrapper_path
+      def initialize(wrapper_path = nil)
-
+        @wrapper_path = wrapper_path
      def self.dest_path
        "/usr/local/bin/vagrant-lxc-wrapper"
      end
      def initialize(privileged: true)
        @wrapper_path = Pathname.new(SudoWrapper.dest_path).exist? && SudoWrapper.dest_path || nil
        @privileged   = privileged
        @logger       = Log4r::Logger.new("vagrant::lxc::sudo_wrapper")
      end
      def run(*command)
-        options = command.last.is_a?(Hash) ? command.last : {}
+        command.unshift @wrapper_path if @wrapper_path
        # Avoid running LXC commands with a restrictive umask.
        # Otherwise disasters occur, like the container root directory
        # having permissions `rwxr-x---` which prevents the `vagrant`
        # user from accessing its own home directory; among other
        # problems, SSH cannot then read `authorized_keys`!
        old_mask = File.umask
        File.umask(old_mask & 022)  # allow all `r` and `x` bits
        begin
          if @privileged
            if @wrapper_path && !options[:no_wrapper]
              command.unshift @wrapper_path
        execute *(['sudo'] + command)
      end
      def su_c(command)
        su_command = if @wrapper_path
            "#{@wrapper_path} \"#{command}\""
          else
-              execute *(['sudo', '/usr/bin/env'] + command)
+            "su root -c \"#{command}\""
            end
          else
            execute *(['/usr/bin/env'] + command)
          end
        ensure
          File.umask(old_mask)
          end
        @logger.debug "Running 'sudo #{su_command}'"
        system "sudo #{su_command}"
      end
      private
@ -68,10 +49,10 @@ module Vagrant
          # nicely handled by Vagrant.
          if r.exit_code != 0
            if @interrupted
-              raise LXC::Errors::SubprocessInterruptError, command.inspect
+              @logger.info("Exit code != 0, but interrupted. Ignoring.")
            else
              raise LXC::Errors::ExecuteError,
-                command: command.inspect, stderr: r.stderr, stdout: r.stdout, exitcode: r.exit_code
+                command: command.inspect, stderr: r.stderr, stdout: r.stdout
            end
          end
        end
--- a/lib/vagrant-lxc/synced_folder.rb
+++ b/lib/vagrant-lxc/synced_folder.rb
@ -8,15 +8,6 @@ module Vagrant
      def prepare(machine, folders, _opts)
        machine.ui.output(I18n.t("vagrant.actions.lxc.share_folders.preparing"))
        # short guestpaths first, so we don't step on ourselves
        folders = folders.sort_by do |id, data|
          if data[:guestpath]
            data[:guestpath].length
          else
            # A long enough path to just do this at the end.
            10000
          end
        end
        folders.each do |id, data|
          host_path  = Pathname.new(File.expand_path(data[:hostpath], machine.env.root_path))
@ -46,27 +37,6 @@ module Vagrant
                                guest_path: data[:guestpath]))
        end
      end
      def enable(machine, folders, _opts)
        # Emit an upstart event if we can
        return unless machine.communicate.test("test -x /sbin/initctl")
        # short guestpaths first, so we don't step on ourselves
        folders = folders.sort_by do |id, data|
          if data[:guestpath]
            data[:guestpath].length
          else
            # A long enough path to just do this at the end.
            10000
          end
        end
        folders.each do |id, data|
          guest_path = data[:guestpath]
          machine.communicate.sudo(
            "/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{guest_path}")
        end
      end
    end
  end
 end
--- a/lib/vagrant-lxc/version.rb
+++ b/lib/vagrant-lxc/version.rb
@ -1,5 +1,5 @@
 module Vagrant
  module LXC
-    VERSION = "1.4.2"
+    VERSION = "1.0.0.alpha.1"
  end
 end
--- a/locales/en.yml
+++ b/locales/en.yml
@ -13,18 +13,15 @@ en:
      force_shutdown: |-
        Forcing shutdown of container...
      warn_networks: |-
-        Warning! The LXC provider doesn't support public networks, the settings
+        Warning! The LXC provider doesn't support any of the Vagrant public / private
-        will be silently ignored.
+        network configurations (ex: `config.vm.network :private_network, ip: "some-ip"`).
        They will be silently ignored.
      warn_group: |-
        Warning! The LXC provider doesn't support the :group parameter for synced
        folders. It will be silently ignored.
      warn_owner: |-
        Warning! The LXC provider doesn't support the :owner parameter for synced
        folders. It will be silently ignored.
      setup_private_network: |-
        Setting up private networks...
      remove_bridge: |-
        Removing bridge '%{name}'...
  vagrant:
    commands:
@ -40,9 +37,6 @@ en:
          preparing: Setting up mount entries for shared folders...
    errors:
      lxc_interrupt_error: |-
        Interrupted
      lxc_execute_error: |-
        There was an error executing %{command}
@ -62,12 +56,8 @@ en:
        Looked up under: %{paths}
      lxc_linux_required: |-
        The LXC provider only works on Linux. Please try to use
        another provider.
      lxc_not_installed: |-
-        The `lxc` package does not seem to be installed or `lxc-create` is not accessible on the PATH.
+        The `lxc` package does not seem to be installed or is not accessible on the PATH.
      lxc_redir_not_installed: |-
        `redir` is not installed or is not accessible on the PATH.
@ -76,7 +66,3 @@ en:
        There is container on your system with the same name you've specified
        on your Vagrantfile (%{name}), please choose a different one or
        run `lxc-destroy --name %{name}` and try again.
      lxc_command_not_supported: |-
        Command (lxc-%{command}) not supported in version %{version}.
        This command is available with version %{available_version}.
--- a/scripts/lxc-template
+++ b/scripts/lxc-template
@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # This is a modified version of /usr/share/lxc/templates/lxc-download
 # that comes with ubuntu-lxc 1.0.0 stable from ppa changed to suit vagrant-lxc needs
@ -33,9 +33,6 @@ LXC_PATH=
 LXC_ROOTFS=
 LXC_TARBALL=
 LXC_CONFIG=
 LXC_USE_OLDCONFIG=
 LXC_STRIP_COMPONENTS=2
 usage() {
    cat <<EOF
@ -46,7 +43,6 @@ Required arguments:
 Optional arguments:
 [ --config ]: Configuration file to be used when building the container
 [ --oldconfig ]: Use pre LXC 2.1 config format
 [ -h | --help ]: This help message
 LXC internal arguments (do not pass manually!):
@ -55,12 +51,11 @@ LXC internal arguments (do not pass manually!):
 [ --rootfs <rootfs> ]: The path to the container's rootfs
 [ --mapped-uid <map> ]: A uid map (user namespaces)
 [ --mapped-gid <map> ]: A gid map (user namespaces)
 [ --strip-components <num> ]: Number of path components to strip from tarball
 EOF
    return 0
 }
-options=$(getopt -o h -l tarball:,config:,oldconfig,help:,name:,path:,rootfs:,mapped-uid:,mapped-gid:,strip-components: -- "$@")SS
+options=$(getopt -o h -l tarball:,config:,help:,name:,path:,rootfs:,mapped-uid:,mapped-gid: -- "$@")SS
 if [ $? -ne 0 ]; then
    usage $(basename $0)
@ -73,14 +68,12 @@ do
    case "$1" in
        -h|--help)          usage $0 && exit 0;;
        --config)           LXC_CONFIG=$2; shift 2;;
        --oldconfig)        LXC_USE_OLDCONFIG=1; shift 1;;
        --tarball)          LXC_TARBALL=$2; shift 2;;
        --name)             LXC_NAME=$2; shift 2;;
        --path)             LXC_PATH=$2; shift 2;;
        --rootfs)           LXC_ROOTFS=$2; shift 2;;
        --mapped-uid)       LXC_MAPPED_UID=$2; shift 2;;
        --mapped-gid)       LXC_MAPPED_GID=$2; shift 2;;
        --strip-components) LXC_STRIP_COMPONENTS=$2; shift 2;;
        *)                  break;;
    esac
 done
@ -95,25 +88,25 @@ if [ -z "${LXC_TARBALL}" ]; then
    exit 1
 fi
 if [ -z "${LXC_ROOTFS}" ]; then
    echo "'rootfs' parameter is required"
    exit 1
 fi
 if [ -z "${LXC_CONFIG}" ]; then
    echo "'config' parameter is required"
    exit 1
 fi
 if [ -z "${LXC_PATH}" ]; then
    echo "'path' parameter is required"
    exit 1
 fi
 # if $LXC_ROOTFS exists here, it was passed in with --rootfs
 if [ -z "${LXC_ROOTFS}" ]; then
    config=${LXC_PATH}/config
    if grep -q '^lxc.rootfs' $config 2>/dev/null ; then
        LXC_ROOTFS=`grep 'lxc.rootfs =' $config | awk -F= '{ print $2 }'`
    else
        LXC_ROOTFS=$LXC_PATH/rootfs
        echo "lxc.rootfs = ${LXC_ROOTFS}" >> $config
    fi
 fi
 # Unpack the rootfs
 echo "Unpacking the rootfs"
 mkdir -p /var/lock/subsys
 (
    flock -x 200
    if [ $? -ne 0 ]; then
@ -122,14 +115,13 @@ echo "Unpacking the rootfs"
    fi
    mkdir -p ${LXC_ROOTFS}
-    (cd ${LXC_ROOTFS} && tar xfz ${LXC_TARBALL} --strip-components=${LXC_STRIP_COMPONENTS} --xattrs --xattrs-include=* || true)
+    (cd ${LXC_ROOTFS} && tar xfz ${LXC_TARBALL} --strip-components=2)
-    if [ ! -f ${LXC_ROOTFS}/bin/true ]; then
+    if [ $? -ne 0 ]; then
        echo "Failed to extract rootfs"
        exit 1
    fi
-) 200>${LXC_PATH}/vagrant_lock
+) 200>/var/lock/subsys/lxc
 rm ${LXC_PATH}/vagrant_lock
 mkdir -p ${LXC_ROOTFS}/dev/pts/
@ -148,12 +140,7 @@ if [ -e "${LXC_PATH}/config-auto" ]; then
    cat ${LXC_PATH}/config-auto >> ${LXC_PATH}/config
    rm ${LXC_PATH}/config-auto
 fi
-
+echo "lxc.utsname = ${LXC_NAME}" >> ${LXC_PATH}/config
 if [ $LXC_USE_OLDCONFIG ]; then
    echo "lxc.utsname = ${LXC_NAME}" >> ${LXC_PATH}/config
 else
    echo "lxc.uts.name = ${LXC_NAME}" >> ${LXC_PATH}/config
 fi
 ## Re-add the previously removed network config
 if [ -e "${LXC_PATH}/config-network" ]; then
@ -164,13 +151,11 @@ if [ -e "${LXC_PATH}/config-network" ]; then
    rm ${LXC_PATH}/config-network
 fi
-if [ -n "${LXC_CONFIG}" ]; then
+## Append the defaults
-    ## Append the defaults
+echo "" >> ${LXC_PATH}/config
-    echo "" >> ${LXC_PATH}/config
+echo "##############################################" >> ${LXC_PATH}/config
-    echo "##############################################" >> ${LXC_PATH}/config
+echo "# vagrant-lxc base box specific configuration" >> ${LXC_PATH}/config
-    echo "# vagrant-lxc base box specific configuration" >> ${LXC_PATH}/config
+cat ${LXC_CONFIG} >> ${LXC_PATH}/config
    cat ${LXC_CONFIG} >> ${LXC_PATH}/config
 fi
 # Empty section for lxc.customize calls from vagrantfile
 echo "" >> ${LXC_PATH}/config
--- a/scripts/pipework
+++ b/scripts/pipework
@ -1,422 +0,0 @@
 #!/bin/sh
 # This code should (try to) follow Google's Shell Style Guide
 # (https://google-styleguide.googlecode.com/svn/trunk/shell.xml)
 set -e
 case "$1" in
  --wait)
    WAIT=1
    ;;
 esac
 IFNAME=$1
 # default value set further down if not set here
 CONTAINER_IFNAME=
 if [ "$2" = "-i" ]; then
  CONTAINER_IFNAME=$3
  shift 2
 fi
 if [ "$2" = "-l" ]; then
  LOCAL_IFNAME=$3
  shift 2
 fi
 GUESTNAME=$2
 IPADDR=$3
 MACADDR=$4
 case "$MACADDR" in
  *@*)
    VLAN="${MACADDR#*@}"
    VLAN="${VLAN%%@*}"
    MACADDR="${MACADDR%%@*}"
    ;;
  *)
    VLAN=
    ;;
 esac
 # did they ask to generate a custom MACADDR?
 # generate the unique string
 case "$MACADDR" in
  U:*)
    macunique="${MACADDR#*:}"
    # now generate a 48-bit hash string from $macunique
    MACADDR=$(echo $macunique|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/')
   ;;
 esac
 [ "$IPADDR" ] || [ "$WAIT" ] || {
  echo "Syntax:"
  echo "pipework <hostinterface> [-i containerinterface] [-l localinterfacename] <guest> <ipaddr>/<subnet>[@default_gateway] [macaddr][@vlan]"
  echo "pipework <hostinterface> [-i containerinterface] [-l localinterfacename] <guest> dhcp [macaddr][@vlan]"
  echo "pipework route <guest> <route_command>"
  echo "pipework --wait [-i containerinterface]"
  exit 1
 }
 # Succeed if the given utility is installed. Fail otherwise.
 # For explanations about `which` vs `type` vs `command`, see:
 # http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script/677212#677212
 # (Thanks to @chenhanxiao for pointing this out!)
 installed () {
  command -v "$1" >/dev/null 2>&1
 }
 # Google Styleguide says error messages should go to standard error.
 warn () {
  echo "$@" >&2
 }
 die () {
  status="$1"
  shift
  warn "$@"
  exit "$status"
 }
 # First step: determine type of first argument (bridge, physical interface...),
 # Unless "--wait" is set (then skip the whole section)
 if [ -z "$WAIT" ]; then 
  if [ -d "/sys/class/net/$IFNAME" ]
  then
    if [ -d "/sys/class/net/$IFNAME/bridge" ]; then
      IFTYPE=bridge
      BRTYPE=linux
    elif installed ovs-vsctl && ovs-vsctl list-br|grep -q "^${IFNAME}$"; then
      IFTYPE=bridge
      BRTYPE=openvswitch
    elif [ "$(cat "/sys/class/net/$IFNAME/type")" -eq 32 ]; then # InfiniBand IPoIB interface type 32
      IFTYPE=ipoib
      # The IPoIB kernel module is fussy, set device name to ib0 if not overridden
      CONTAINER_IFNAME=${CONTAINER_IFNAME:-ib0}
      PKEY=$VLAN
    else IFTYPE=phys
    fi
  else
    case "$IFNAME" in
      br*)
        IFTYPE=bridge
        BRTYPE=linux
        ;;
      ovs*)
        if ! installed ovs-vsctl; then
          die 1 "Need OVS installed on the system to create an ovs bridge"
        fi
        IFTYPE=bridge
        BRTYPE=openvswitch
        ;;
      route*)
        IFTYPE=route
        ;;
      dummy*)
        IFTYPE=dummy
        ;;
      *) die 1 "I do not know how to setup interface $IFNAME." ;;
    esac
  fi
 fi
 # Set the default container interface name to eth1 if not already set
 CONTAINER_IFNAME=${CONTAINER_IFNAME:-eth1}
 [ "$WAIT" ] && {
  while true; do
    # This first method works even without `ip` or `ifconfig` installed,
    # but doesn't work on older kernels (e.g. CentOS 6.X). See #128.
    grep -q '^1$' "/sys/class/net/$CONTAINER_IFNAME/carrier" && break
    # This method hopefully works on those older kernels.
    ip link ls dev "$CONTAINER_IFNAME" && break
    sleep 1
  done > /dev/null 2>&1
  exit 0
 }
 [ "$IFTYPE" = bridge ] && [ "$BRTYPE" = linux ] && [ "$VLAN" ] && {
  die 1 "VLAN configuration currently unsupported for Linux bridge."
 }
 [ "$IFTYPE" = ipoib ] && [ "$MACADDR" ] && {
  die 1 "MACADDR configuration unsupported for IPoIB interfaces."
 }
 # Second step: find the guest (for now, we only support LXC containers)
 while read _ mnt fstype options _; do
  [ "$fstype" != "cgroup" ] && continue
  echo "$options" | grep -qw devices || continue
  CGROUPMNT=$mnt
 done < /proc/mounts
 [ "$CGROUPMNT" ] || {
    die 1 "Could not locate cgroup mount point."
 }
 # Try to find a cgroup matching exactly the provided name.
 N=$(find "$CGROUPMNT" -name "$GUESTNAME" | wc -l)
 case "$N" in
  0)
    # If we didn't find anything, try to lookup the container with Docker.
    if installed docker; then
      RETRIES=3
      while [ "$RETRIES" -gt 0 ]; do
        DOCKERPID=$(docker inspect --format='{{ .State.Pid }}' "$GUESTNAME")
        [ "$DOCKERPID" != 0 ] && break
        sleep 1
        RETRIES=$((RETRIES - 1))
      done
      [ "$DOCKERPID" = 0 ] && {
        die 1 "Docker inspect returned invalid PID 0"
      }
      [ "$DOCKERPID" = "<no value>" ] && {
        die 1 "Container $GUESTNAME not found, and unknown to Docker."
      }
    else
      die 1 "Container $GUESTNAME not found, and Docker not installed."
    fi
    ;;
  1) true ;;
  *) die 1 "Found more than one container matching $GUESTNAME." ;;
 esac
 # only check IPADDR if we are not in a route mode
 [ "$IFTYPE" != route ] && {
  case "$IPADDR" in
    # Let's check first if the user asked for DHCP allocation.
    dhcp|dhcp:*)
      # Use Docker-specific strategy to run the DHCP client
      # from the busybox image, in the network namespace of
      # the container.
      if ! [ "$DOCKERPID" ]; then
        warn "You asked for a Docker-specific DHCP method."
        warn "However, $GUESTNAME doesn't seem to be a Docker container."
        warn "Try to replace 'dhcp' with another option?"
        die 1 "Aborting."
      fi
      DHCP_CLIENT=${IPADDR%%:*}
      ;;
    udhcpc|udhcpc:*|udhcpc-f|udhcpc-f:*|dhcpcd|dhcpcd:*|dhclient|dhclient:*|dhclient-f|dhclient-f:*)
      DHCP_CLIENT=${IPADDR%%:*}
      # did they ask for the client to remain?
      DHCP_FOREGROUND=
      [ "${DHCP_CLIENT: -2}" = '-f' ] && {
        DHCP_FOREGROUND=true
      }
      DHCP_CLIENT=${DHCP_CLIENT%-f}
      if ! installed "$DHCP_CLIENT"; then
        die 1 "You asked for DHCP client $DHCP_CLIENT, but I can't find it."
      fi
      ;;
    # Alright, no DHCP? Then let's see if we have a subnet *and* gateway.
    */*@*)
      GATEWAY="${IPADDR#*@}" GATEWAY="${GATEWAY%%@*}"
      IPADDR="${IPADDR%%@*}"
      ;;
    # No gateway? We need at least a subnet, anyway!
    */*) : ;;
    # ... No? Then stop right here.
    *)
      warn "The IP address should include a netmask."
      die 1 "Maybe you meant $IPADDR/24 ?"
      ;;
  esac
 }
 # If a DHCP method was specified, extract the DHCP options.
 if [ "$DHCP_CLIENT" ]; then
  case "$IPADDR" in
    *:*) DHCP_OPTIONS="${IPADDR#*:}" ;;
  esac
 fi
 if [ "$DOCKERPID" ]; then
  NSPID=$DOCKERPID
 else
  NSPID=$(head -n 1 "$(find "$CGROUPMNT" -name "$GUESTNAME" | head -n 1)/tasks")
  [ "$NSPID" ] || {
    # it is an alternative way to get the pid
    NSPID=$(lxc-info -n  "$GUESTNAME" | grep PID | grep -Eo '[0-9]+')
    [ "$NSPID" ] || {
      die 1 "Could not find a process inside container $GUESTNAME."
    }
  }
 fi
 # Check if an incompatible VLAN device already exists
 [ "$IFTYPE" = phys ] && [ "$VLAN" ] && [ -d "/sys/class/net/$IFNAME.VLAN" ] && {
  ip -d link show "$IFNAME.$VLAN" | grep -q "vlan.*id $VLAN" || {
    die 1 "$IFNAME.VLAN already exists but is not a VLAN device for tag $VLAN"
  }
 }
 [ ! -d /var/run/netns ] && mkdir -p /var/run/netns
 rm -f "/var/run/netns/$NSPID"
 ln -s "/proc/$NSPID/ns/net" "/var/run/netns/$NSPID"
 # Check if we need to create a bridge.
 [ "$IFTYPE" = bridge ] && [ ! -d "/sys/class/net/$IFNAME" ] && {
  [ "$BRTYPE" = linux ] && {
    (ip link add dev "$IFNAME" type bridge > /dev/null 2>&1) || (brctl addbr "$IFNAME")
    ip link set "$IFNAME" up
  }
  [ "$BRTYPE" = openvswitch ] && {
    ovs-vsctl add-br "$IFNAME"
  }
 }
 [ "$IFTYPE" != "route" ] && [ "$IFTYPE" != "dummy" ] && MTU=$(ip link show "$IFNAME" | awk '{print $5}')
 # If it's a bridge, we need to create a veth pair
 [ "$IFTYPE" = bridge ] && {
  if [ -z "$LOCAL_IFNAME" ]; then
    LOCAL_IFNAME="v${CONTAINER_IFNAME}pl${NSPID}"
  fi
  GUEST_IFNAME="v${CONTAINER_IFNAME}pg${NSPID}"
  # Does the link already exist?
  if ip link show "$LOCAL_IFNAME" >/dev/null 2>&1; then
    # link exists, is it in use?
    if ip link show "$LOCAL_IFNAME" up | grep -q "UP"; then
      echo "Link $LOCAL_IFNAME exists and is up"
      exit 1
    fi
    # delete the link so we can re-add it afterwards
    ip link del "$LOCAL_IFNAME"
  fi
  ip link add name "$LOCAL_IFNAME" mtu "$MTU" type veth peer name "$GUEST_IFNAME" mtu "$MTU"
  case "$BRTYPE" in
    linux)
      (ip link set "$LOCAL_IFNAME" master "$IFNAME" > /dev/null 2>&1) || (brctl addif "$IFNAME" "$LOCAL_IFNAME")
      ;;
    openvswitch)
      if ! ovs-vsctl list-ports "$IFNAME" | grep -q "^${LOCAL_IFNAME}$"; then
        ovs-vsctl add-port "$IFNAME" "$LOCAL_IFNAME" ${VLAN:+tag="$VLAN"}
      fi
      ;;
  esac
  ip link set "$LOCAL_IFNAME" up
 }
 # If it's a physical interface, create a macvlan subinterface
 [ "$IFTYPE" = phys ] && {
  [ "$VLAN" ] && {
    [ ! -d "/sys/class/net/${IFNAME}.${VLAN}" ] && {
      ip link add link "$IFNAME" name "$IFNAME.$VLAN" mtu "$MTU" type vlan id "$VLAN"
    }
    ip link set "$IFNAME" up
    IFNAME=$IFNAME.$VLAN
  }
  GUEST_IFNAME=ph$NSPID$CONTAINER_IFNAME
  ip link add link "$IFNAME" dev "$GUEST_IFNAME" mtu "$MTU" type macvlan mode bridge
  ip link set "$IFNAME" up
 }
 # If it's an IPoIB interface, create a virtual IPoIB interface (the IPoIB
 # equivalent of a macvlan device)
 #
 # Note: no macvlan subinterface nor Ethernet bridge can be created on top of an
 # IPoIB interface. InfiniBand is not Ethernet. IPoIB is an IP layer on top of
 # InfiniBand, without an intermediate Ethernet layer.
 [ "$IFTYPE" = ipoib ] && {
  GUEST_IFNAME="${IFNAME}.${NSPID}"
  # If a partition key is provided, use it
  [ "$PKEY" ] && {
    GUEST_IFNAME="${IFNAME}.${PKEY}.${NSPID}"
    PKEY="pkey 0x$PKEY"
  }
  ip link add link "$IFNAME" name "$GUEST_IFNAME" type ipoib $PKEY
  ip link set "$IFNAME" up
 }
 # If its a dummy interface, create a dummy interface.
 [ "$IFTYPE" = dummy ] && {
  GUEST_IFNAME=du$NSPID$CONTAINER_IFNAME
  ip link add dev "$GUEST_IFNAME" type dummy
 }
 # If the `route` command was specified ...
 if [ "$IFTYPE" = route ]; then
  # ... discard the first two arguments and pass the rest to the route command.
  shift 2
  ip netns exec "$NSPID" ip route "$@"
 else 
  # Otherwise, run normally.
  ip link set "$GUEST_IFNAME" netns "$NSPID"
  ip netns exec "$NSPID" ip link set "$GUEST_IFNAME" name "$CONTAINER_IFNAME"
  [ "$MACADDR" ] && ip netns exec "$NSPID" ip link set dev "$CONTAINER_IFNAME" address "$MACADDR"
  # When using any of the DHCP methods, we start a DHCP client in the
  # network namespace of the container. With the 'dhcp' method, the
  # client used is taken from the Docker busybox image (therefore
  # requiring no specific client installed on the host). Other methods
  # use a locally installed client.
  case "$DHCP_CLIENT" in
    dhcp)
      docker run -d --net container:$GUESTNAME --cap-add NET_ADMIN \
             busybox udhcpc -i "$CONTAINER_IFNAME" -x "hostname:$GUESTNAME" \
             $DHCP_OPTIONS \
             >/dev/null
      ;;
    udhcpc)
      DHCP_Q="-q"
      [ "$DHCP_FOREGROUND" ] && {
        DHCP_OPTIONS="$DHCP_OPTIONS -f"
      }
      ip netns exec "$NSPID" "$DHCP_CLIENT" -qi "$CONTAINER_IFNAME" \
                                            -x "hostname:$GUESTNAME" \
                                            -p "/var/run/udhcpc.$GUESTNAME.pid" \
                                            $DHCP_OPTIONS
      [ ! "$DHCP_FOREGROUND" ] && {
        rm "/var/run/udhcpc.$GUESTNAME.pid"
      }
      ;;
    dhclient)
      ip netns exec "$NSPID" "$DHCP_CLIENT" "$CONTAINER_IFNAME" \
                                            -pf "/var/run/dhclient.$GUESTNAME.pid" \
                                            -lf "/etc/dhclient/dhclient.$GUESTNAME.leases" \
                                            $DHCP_OPTIONS
      # kill dhclient after get ip address to prevent device be used after container close
      [ ! "$DHCP_FOREGROUND" ] && {
        kill "$(cat "/var/run/dhclient.$GUESTNAME.pid")"
        rm "/var/run/dhclient.$GUESTNAME.pid"
      }
      ;;
    dhcpcd)
      ip netns exec "$NSPID" "$DHCP_CLIENT" -q "$CONTAINER_IFNAME" -h "$GUESTNAME"
      ;;
    "")
      if installed ipcalc; then
        eval "$(ipcalc -b $IPADDR)"
        ip netns exec "$NSPID" ip addr add "$IPADDR" brd "$BROADCAST" dev "$CONTAINER_IFNAME"
      else
        ip netns exec "$NSPID" ip addr add "$IPADDR" dev "$CONTAINER_IFNAME"
      fi
      [ "$GATEWAY" ] && {
        ip netns exec "$NSPID" ip route delete default >/dev/null 2>&1 && true
      }
      ip netns exec "$NSPID" ip link set "$CONTAINER_IFNAME" up
      [ "$GATEWAY" ] && {
        ip netns exec "$NSPID" ip route get "$GATEWAY" >/dev/null 2>&1 || \
        ip netns exec "$NSPID" ip route add "$GATEWAY/32" dev "$CONTAINER_IFNAME"
        ip netns exec "$NSPID" ip route replace default via "$GATEWAY"
      }
      ;;
  esac
  # Give our ARP neighbors a nudge about the new interface
  if installed arping; then
    IPADDR=$(echo "$IPADDR" | cut -d/ -f1)
    ip netns exec "$NSPID" arping -c 1 -A -I "$CONTAINER_IFNAME" "$IPADDR" > /dev/null 2>&1 || true
  else
    echo "Warning: arping not found; interface may not be immediately reachable"
  fi
 fi
 # Remove NSPID to avoid `ip netns` catch it.
 rm -f "/var/run/netns/$NSPID"
 # vim: set tabstop=2 shiftwidth=2 softtabstop=2 expandtab :
--- a/spec/Vagrantfile
+++ b/spec/Vagrantfile
@ -15,6 +15,10 @@ Vagrant.configure("2") do |config|
  config.cache.auto_detect = true
  config.vm.provider :lxc do |lxc|
    # lxc.sudo_wrapper = '/usr/bin/lxc-vagrant-wrapper'
  end
  config.vm.provision :shell,
    inline: 'mkdir -p /vagrant/tmp && echo -n "Provisioned" > /vagrant/tmp/provisioning'
--- a/spec/unit/action/forward_ports_spec.rb
+++ b/spec/unit/action/forward_ports_spec.rb
@ -6,7 +6,7 @@ require 'vagrant-lxc/action/forward_ports'
 describe Vagrant::LXC::Action::ForwardPorts do
  let(:app)          { double(:app, call: true) }
-  let(:env)          { {machine: machine, ui: double(info: true, warn: true)} }
+  let(:env)          { {machine: machine, ui: double(info: true)} }
  let(:machine)      { double(:machine) }
  let!(:data_dir)    { Pathname.new(Dir.mktmpdir) }
  let(:provider)     { double(Vagrant::LXC::Provider, ssh_info: {host: container_ip}) }
@ -24,7 +24,6 @@ describe Vagrant::LXC::Action::ForwardPorts do
    machine.stub_chain(:config, :vm, :networks).and_return(networks)
    machine.stub(provider: provider, data_dir: data_dir)
    subject.stub(redir_version: 3)
    subject.stub(exec: true)
    subject.stub(spawn: pid)
  end
@ -35,25 +34,25 @@ describe Vagrant::LXC::Action::ForwardPorts do
    subject.stub(system: true)
    subject.call(env)
    expect(subject).to have_received(:spawn).with(
-      "redir -n #{host_ip}:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
+      "redir --laddr=#{host_ip} --lport=#{host_port} --caddr=#{container_ip} --cport=#{guest_port} 2>/dev/null"
    )
  end
-  it 'Uses 127.0.0.1 as default if host_ip is nil' do
+  it 'skips --laddr parameter if host_ip is nil' do
    forward_conf.delete(:host_ip)
    subject.stub(system: true)
    subject.call(env)
    expect(subject).to have_received(:spawn).with(
-      "redir -n 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
+      "redir --lport=#{host_port} --caddr=#{container_ip} --cport=#{guest_port} 2>/dev/null"
    )
  end
-  it 'Uses 127.0.0.1 by default if host_ip is a blank string' do
+  it 'skips --laddr parameter if host_ip is a blank string' do
    forward_conf[:host_ip] = ' '
    subject.stub(system: true)
    subject.call(env)
    expect(subject).to have_received(:spawn).with(
-      "redir -n 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
+      "redir --lport=#{host_port} --caddr=#{container_ip} --cport=#{guest_port} 2>/dev/null"
    )
  end
@ -71,47 +70,8 @@ describe Vagrant::LXC::Action::ForwardPorts do
    expect(subject).not_to have_received(:spawn)
  end
  it 'uses redir 2.x command line interface' do
    subject.stub(system: true)
    subject.stub(redir_version: 2)
    subject.call(env)
    expect(subject).to have_received(:spawn).with(
      "redir --laddr=#{host_ip} --lport=#{host_port} --caddr=#{container_ip} --cport=#{guest_port} 2>/dev/null"
    )
  end
  it 'raises RedirNotInstalled error if `redir` is not installed' do
    subject.stub(system: false)
    expect { subject.call(env) }.to raise_error(Vagrant::LXC::Errors::RedirNotInstalled)
  end
  context 'when a privileged port is used' do
    let(:host_port) { 80 }
    it 'forwards ports using redir' do
      subject.stub(system: true)
      subject.call(env)
      expect(subject).to have_received(:spawn).with(
        "sudo redir -n #{host_ip}:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
      )
    end
    it 'Uses 127.0.0.1 by default if host_ip is nil' do
      forward_conf.delete(:host_ip)
      subject.stub(system: true)
      subject.call(env)
      expect(subject).to have_received(:spawn).with(
        "sudo redir -n 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
      )
    end
    it 'Uses 127.0.0.1 by default if host_ip is a blank string' do
      forward_conf[:host_ip] = ' '
      subject.stub(system: true)
      subject.call(env)
      expect(subject).to have_received(:spawn).with(
        "sudo redir -n 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
      )
    end
  end
 end
--- a/spec/unit/driver/cli_spec.rb
+++ b/spec/unit/driver/cli_spec.rb
@ -4,7 +4,7 @@ require 'vagrant-lxc/sudo_wrapper'
 require 'vagrant-lxc/driver/cli'
 describe Vagrant::LXC::Driver::CLI do
-  let(:sudo_wrapper) { double(Vagrant::LXC::SudoWrapper, run: true, wrapper_path: nil) }
+  let(:sudo_wrapper) { double(Vagrant::LXC::SudoWrapper, run: true) }
  subject { described_class.new(sudo_wrapper) }
@ -29,40 +29,20 @@ describe Vagrant::LXC::Driver::CLI do
  end
  describe 'version' do
-    before do
+    let(:lxc_version_out) { "lxc version:  0.x.y-rc1\n" }
      allow(subject).to receive(:run).with(:create, '--version').and_return(lxc_version_out)
    end
-    describe 'lxc version after 1.x.x' do
+    before do
-      let(:lxc_version_out) { "1.0.0\n" }
+      allow(subject).to receive(:run).with(:version).and_return(lxc_version_out)
    end
    it 'parses the version from the output' do
-        expect(subject.version).to eq('1.0.0')
+      expect(subject.version).to eq('0.x.y-rc1')
      end
    end
  end
  describe 'config' do
    before do
      allow(subject).to receive(:run).with(:config, 'lxc.lxcpath').and_return(lxc_config_out)
      allow(subject).to receive(:run).with(:create, '--version').and_return(lxc_version_out)
    end
    describe 'lxc version after 1.x.x'do
      let(:lxc_config_out)           { "/var/lib/lxc\n" }
      let(:lxc_version_out)          { "1.0.0\n" }
      it 'parser the lxc.lxcpath value' do
        expect(subject.config('lxc.lxcpath')).not_to end_with("\n")
      end
    end
  end
  describe 'create' do
    let(:template)      { 'quantal-64' }
    let(:name)          { 'quantal-container' }
    let(:backingstore)      { 'btrfs' }
    let(:backingstore_opts) { [['--dir', '/tmp/foo'], ['--foo', 'bar']] }
    let(:config_file)   { 'config' }
    let(:template_args) { { '--extra-param' => 'param', '--other' => 'value' } }
@ -73,13 +53,11 @@ describe Vagrant::LXC::Driver::CLI do
    end
    it 'issues a lxc-create with provided template, container name and hash of arguments' do
-      subject.create(template, backingstore, backingstore_opts, config_file, template_args)
+      subject.create(template, config_file, template_args)
      expect(subject).to have_received(:run).with(
        :create,
        '-B',         backingstore,
        '--template', template,
        '--name',     name,
        *(backingstore_opts.flatten),
        '-f',         config_file,
        '--',
        '--extra-param', 'param',
@ -90,7 +68,7 @@ describe Vagrant::LXC::Driver::CLI do
    it 'wraps a low level error into something more meaningful in case the container already exists' do
      allow(subject).to receive(:run) { raise Vagrant::LXC::Errors::ExecuteError, stderr: 'alreAdy Exists' }
      expect {
-        subject.create(template, backingstore, backingstore_opts, config_file, template_args)
+        subject.create(template, config_file, template_args)
      }.to raise_error(Vagrant::LXC::Errors::ContainerAlreadyExists)
    end
  end
@ -128,17 +106,23 @@ describe Vagrant::LXC::Driver::CLI do
    end
  end
-  describe 'stop' do
+  describe 'shutdown' do
    let(:name) { 'a-running-container' }
    subject    { described_class.new(sudo_wrapper, name) }
    before do
      subject.stub(system: true)
      allow(subject).to receive(:run)
      subject.stop
    end
-    it 'issues a lxc-stop with provided container name' do
+    it 'issues a lxc-shutdown with provided container name' do
-      expect(subject).to have_received(:run).with(:stop, '--name', name)
+      subject.shutdown
      expect(subject).to have_received(:run).with(:shutdown, '--name', name)
    end
    it 'raises a ShutdownNotSupported in case it is not supported' do
      allow(subject).to receive(:system).with('which lxc-shutdown > /dev/null').and_return(false)
      expect { subject.shutdown }.to raise_error(described_class::ShutdownNotSupported)
    end
  end
@ -185,9 +169,19 @@ describe Vagrant::LXC::Driver::CLI do
      subject.attach *(command + [{namespaces: ['network', 'mount']}])
      expect(subject).to have_received(:run).with(:attach, '--name', name, '--namespaces', 'NETWORK|MOUNT', '--', *command)
    end
    it 'raises a NamespacesNotSupported error if not supported' do
      allow(subject).to receive(:run).with(:attach, '-h', :show_stderr => true).and_return({:stdout => '', :stderr => 'not supported'})
      expect {
        subject.attach *(command + [{namespaces: ['network', 'mount']}])
      }.to raise_error(Vagrant::LXC::Errors::NamespacesNotSupported)
    end
  end
  describe 'transition block' do
    let(:name) { 'a-running-container' }
    subject    { described_class.new(name) }
    before do
      subject.stub(run: true, sleep: true, state: :stopped)
    end
--- a/spec/unit/driver_spec.rb
+++ b/spec/unit/driver_spec.rb
@ -32,8 +32,6 @@ describe Vagrant::LXC::Driver do
  describe 'creation' do
    let(:name)           { 'container-name' }
    let(:backingstore)      { 'btrfs' }
    let(:backingstore_opts) { [['--dir', '/tmp/foo'], ['--foo', 'bar']] }
    let(:template_name)  { 'auto-assigned-template-id' }
    let(:template_path)  { '/path/to/lxc-template-from-box' }
    let(:template_opts)  { {'--some' => 'random-option'} }
@ -45,7 +43,7 @@ describe Vagrant::LXC::Driver do
    before do
      allow(subject).to receive(:import_template).and_yield(template_name)
-      subject.create name, backingstore, backingstore_opts, template_path, config_file, template_opts
+      subject.create name, template_path, config_file, template_opts
    end
    it 'sets the cli object container name' do
@ -54,9 +52,7 @@ describe Vagrant::LXC::Driver do
    it 'creates container with the right arguments' do
      expect(cli).to have_received(:create).with(
-        template_path,
+        template_name,
        backingstore,
        backingstore_opts,
        config_file,
        template_opts
      )
@ -79,17 +75,11 @@ describe Vagrant::LXC::Driver do
    let(:customizations)         { [['a', '1'], ['b', '2']] }
    let(:internal_customization) { ['internal', 'customization'] }
    let(:cli)                    { double(Vagrant::LXC::Driver::CLI, start: true) }
-    let(:sudo)                   { double(Vagrant::LXC::SudoWrapper) }
+    let(:sudo)                   { double(Vagrant::LXC::SudoWrapper, su_c: true) }
    subject { described_class.new('name', sudo, cli) }
    before do
      sudo.should_receive(:run).with('cat', '/var/lib/lxc/name/config').exactly(2).times.
        and_return('# CONFIGURATION')
      sudo.should_receive(:run).twice.with('cp', '-f', %r{/(run|tmp)/.*}, '/var/lib/lxc/name/config')
      sudo.should_receive(:run).twice.with('chown', 'root:root', '/var/lib/lxc/name/config')
      expect(cli).to receive(:config).with("lxc.lxcpath").and_return("/var/lib/lxc")
      subject.customizations << internal_customization
      subject.start(customizations)
    end
@ -104,7 +94,7 @@ describe Vagrant::LXC::Driver do
  end
  describe 'halt' do
-    let(:cli) { double(Vagrant::LXC::Driver::CLI, stop: true) }
+    let(:cli) { double(Vagrant::LXC::Driver::CLI, shutdown: true) }
    subject { described_class.new('name', nil, cli) }
@ -112,8 +102,8 @@ describe Vagrant::LXC::Driver do
      allow(cli).to receive(:transition_to).and_yield(cli)
    end
-    it 'delegates to cli stop' do
+    it 'delegates to cli shutdown' do
-      expect(cli).to receive(:stop)
+      expect(cli).to receive(:shutdown)
      subject.forced_halt
    end
@ -124,7 +114,14 @@ describe Vagrant::LXC::Driver do
    it 'attempts to force the container to stop in case a shutdown doesnt work' do
      allow(cli).to receive(:shutdown).and_raise(Vagrant::LXC::Driver::CLI::TargetStateNotReached.new :target, :source)
-      expect(cli).to receive(:transition_to).with(:stopped)
+      expect(cli).to receive(:transition_to).with(:stopped).twice
      expect(cli).to receive(:stop)
      subject.forced_halt
    end
    it 'attempts to force the container to stop in case lxc-shutdown is not supported' do
      allow(cli).to receive(:shutdown).and_raise(Vagrant::LXC::Driver::CLI::ShutdownNotSupported)
      expect(cli).to receive(:transition_to).with(:stopped).twice
      expect(cli).to receive(:stop)
      subject.forced_halt
    end
@ -141,117 +138,37 @@ describe Vagrant::LXC::Driver do
    end
  end
  describe 'containers_path' do
    let(:cli) { double(Vagrant::LXC::Driver::CLI, config: cli_config_value) }
    subject { described_class.new('name', nil, cli) }
    describe 'lxc version after 1.x.x' do
      let(:cli_config_value)                 { '/etc/lxc' }
      it 'delegates to cli' do
        expect(subject.containers_path).to eq(cli_config_value)
      end
    end
  end
  describe 'folder sharing' do
    let(:shared_folder)       { {guestpath: '/vagrant', hostpath: '/path/to/host/dir'} }
    let(:ro_rw_folder)        { {guestpath: '/vagrant/ro_rw', hostpath: '/path/to/host/dir', mount_options: ['ro', 'rw']} }
-    let(:with_space_folder)   { {guestpath: '/tmp/with space', hostpath: '/path/with space'} }
+    let(:folders)             { [shared_folder, ro_rw_folder] }
    let(:folders)             { [shared_folder, ro_rw_folder, with_space_folder] }
    let(:expected_guest_path) { "vagrant" }
    let(:sudo_wrapper)        { double(Vagrant::LXC::SudoWrapper, run: true) }
    let(:rootfs_path)         { Pathname('/path/to/rootfs') }
    let(:expected_guest_path) { "#{rootfs_path}/vagrant" }
    let(:sudo_wrapper)        { double(Vagrant::LXC::SudoWrapper, run: true) }
    subject { described_class.new('name', sudo_wrapper) }
    describe "with fixed rootfs" do
    before do
-        subject.stub(rootfs_path: Pathname('/path/to/rootfs'), system: true)
+      subject.stub(rootfs_path: rootfs_path, system: true)
      subject.share_folders(folders)
    end
    it "creates guest folder under container's rootfs" do
      expect(sudo_wrapper).to have_received(:run).with("mkdir", "-p", expected_guest_path)
    end
    it 'adds a mount.entry to its local customizations' do
      expect(subject.customizations).to include [
        'mount.entry',
-          "#{shared_folder[:hostpath]} #{expected_guest_path} none bind,create=dir 0 0"
+        "#{shared_folder[:hostpath]} #{expected_guest_path} none bind 0 0"
      ]
    end
    it 'supports additional mount options' do
      expect(subject.customizations).to include [
        'mount.entry',
-          "#{ro_rw_folder[:hostpath]} vagrant/ro_rw none ro,rw 0 0"
+        "#{ro_rw_folder[:hostpath]} #{rootfs_path}/vagrant/ro_rw none ro,rw 0 0"
      ]
    end
      it 'supports directories with spaces' do
        expect(subject.customizations).to include [
          'mount.entry',
          "/path/with\\040space tmp/with\\040space none bind,create=dir 0 0"
        ]
      end
    end
    describe "with directory-based LXC config" do
      let(:config_string) {
        <<-ENDCONFIG.gsub(/^\s+/, '')
          # Blah blah comment
          lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0
          lxc.mount.entry = sysfs sys sysfs defaults  0 0
          lxc.tty.max = 4
          lxc.pty.max = 1024
          lxc.rootfs.path = #{rootfs_path}
          # VAGRANT-BEGIN
          lxc.network.type=veth
          lxc.network.name=eth1
          # VAGRANT-END
        ENDCONFIG
      }
      before do
        subject { described_class.new('name', sudo_wrapper) }
        subject.stub(config_string: config_string)
        subject.share_folders(folders)
      end
      it 'adds a mount.entry to its local customizations' do
        expect(subject.customizations).to include [
          'mount.entry',
          "#{shared_folder[:hostpath]} #{expected_guest_path} none bind,create=dir 0 0"
        ]
      end
    end
    describe "with overlayfs-based LXC config" do
      let(:config_string) {
        <<-ENDCONFIG.gsub(/^\s+/, '')
          # Blah blah comment
          lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0
          lxc.mount.entry = sysfs sys sysfs defaults  0 0
          lxc.tty.max = 4
          lxc.pty.max = 1024
          lxc.rootfs.path = overlayfs:/path/to/master/directory:#{rootfs_path}
          # VAGRANT-BEGIN
          lxc.network.type=veth
          lxc.network.name=eth1
          # VAGRANT-END
        ENDCONFIG
      }
      before do
        subject { described_class.new('name', sudo_wrapper) }
        subject.stub(config_string: config_string)
        subject.share_folders(folders)
      end
      it 'adds a mount.entry to its local customizations' do
        expect(subject.customizations).to include [
          'mount.entry',
          "#{shared_folder[:hostpath]} #{expected_guest_path} none bind,create=dir 0 0"
        ]
      end
    end
  end
 end
--- a/templates/sudoers.rb.erb
+++ b/templates/sudoers.rb.erb
@ -1,129 +0,0 @@
 #!<%= cmd_paths['ruby'] %>
 # Automatically created by vagrant-lxc
 class Whitelist
  class << self
    def add(command, *args)
      list[command] ||= []
      list[command] << args
    end
    def add_regex(regex, *args)
      regex_list << [regex, [args]]
    end
    def list
      @list ||= {}
    end
    def regex_list
      @regex_list ||= []
    end
    def allowed(command)
      list[command] || allowed_regex(command) || []
    end
    def allowed_regex(command)
      found = regex_list.find { |r| r[0] =~ command }
      return found[1] if found
    end
    def run!(argv)
      begin
        command, args = `which #{argv.shift}`.chomp, argv || []
        check!(command, args)
        system "#{command} #{args.join(" ")}"
        exit_code = $?.to_i
        exit_code = 1 if exit_code == 256
        exit exit_code
      rescue => e
        STDERR.puts e.message
        exit 1
      end
    end
    private
    def check!(command, args)
      allowed(command).each do |checks|
        return if valid_args?(args, checks)
      end
      raise_invalid(command, args)
    end
    def valid_args?(args, checks)
      return false unless valid_length?(args, checks)
      check = nil
      args.each_with_index do |provided, i|
        check = checks[i] unless check == '**'
        return false unless match?(provided, check)
      end
      true
    end
    def valid_length?(args, checks)
      args.length == checks.length || checks.last == '**'
    end
    def match?(arg, check)
      check == '**' || check.is_a?(Regexp) && !!check.match(arg) || arg == check
    end
    def raise_invalid(command, args)
      raise "Invalid arguments for command #{command}, " <<
      "provided args: #{args.inspect}"
    end
  end
 end
 base = "<%= lxc_base_path %>"
 base_path = %r{\A#{base}/.*\z}
 ##
 # Commands from provider.rb
 # - Check lxc is installed
 Whitelist.add '<%= cmd_paths['which'] %>', /\Alxc-\w+\z/
 ##
 # Commands from driver.rb
 # - Container config file
 Whitelist.add '<%= cmd_paths['cat'] %>', base_path
 # - Shared folders
 Whitelist.add '<%= cmd_paths['mkdir'] %>', '-p', base_path
 # - Container config customizations and pruning
 Whitelist.add '<%= cmd_paths['cp'] %>', '-f', %r{/tmp/.*}, base_path
 Whitelist.add '<%= cmd_paths['chown'] %>', 'root:root', base_path
 # - Packaging
 Whitelist.add '<%= cmd_paths['tar'] %>', '--numeric-owner', '-cvzf', %r{/tmp/.*/rootfs.tar.gz}, '-C', base_path, './rootfs'
 Whitelist.add '<%= cmd_paths['chown'] %>', /\A\d+:\d+\z/, %r{\A/tmp/.*/rootfs\.tar\.gz\z}
 # - Private network script and commands
 Whitelist.add '<%= cmd_paths['ip'] %>', 'addr', 'add', /(\d+|\.)+\/24/, 'dev', /.+/
 Whitelist.add '<%= cmd_paths['ip'] %>', 'link', 'set', /.+/, /(up|down)/
 Whitelist.add '<%= cmd_paths['brctl'] %>', /(addbr|delbr)/, /.+/
 Whitelist.add_regex %r{<%= pipework_regex %>}, '**'
 ##
 # Commands from driver/cli.rb
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-version'
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-ls'
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-info', '--name', /.*/
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-info', '--name', /.*/, '-iH'
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-create', '-B', /.*/, '--template', /.*/, '--name', /.*/, '**'
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-create', '--version'
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-destroy', '--name', /.*/
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-start', '-d', '--name', /.*/, '**'
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-stop', '--name', /.*/
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-shutdown', '--name', /.*/
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-attach', '--name', /.*/, '**'
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-attach', '-h'
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-config', 'lxc.lxcpath'
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-update-config', '-c', /.*/
 ##
 # Commands from driver/action/remove_temporary_files.rb
 Whitelist.add '<%= cmd_paths['rm'] %>', '-rf', %r{\A#{base}/.*/rootfs/tmp/.*}
 # Watch out for stones
 Whitelist.run!(ARGV)
--- a/vagrant-lxc.gemspec
+++ b/vagrant-lxc.gemspec
@ -17,4 +17,11 @@ Gem::Specification.new do |gem|
  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
  gem.require_paths = ["lib"]
  gem.post_install_message = %Q{
  Thanks for giving vagrant-lxc #{Vagrant::LXC::VERSION} a try!
  This version introduces many changes and includes some deprecations,
  please see the project's CHANGELOG:
    https://github.com/fgrehm/vagrant-lxc/blob/master/CHANGELOG.md
  }
 end
		`@ -0,0 +1 @@`
							`Vagrant::Action::Builtin.const_set :HandleBox, Vagrant::Action::Builtin::HandleBoxUrl`