vagrant-lxc 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be12d8c8e72a9909dec8bf1a588338dcba483bbc
-  data.tar.gz: 4331cfda3e8612bf69e4090c383967508387acb6
+  metadata.gz: 736cfddbd6bdf4b0fb8d6bbb5291e3dd30722835
+  data.tar.gz: 25d7fba64da0b3f42ae5b537b13db95b55db69ae
 SHA512:
-  metadata.gz: 48107a2da8b24576f1af4999374f96819441332de0fffeed7602554347aed266a4f15e0f3d07e821b16fb54eb3d888b1556cd2db32ecfda3416415e00191fde0
-  data.tar.gz: 7e40658d9a437855025e71b57c9ee82f25e532cc439410763adaa312c5abf2852571552159bd183cedfde9c92bf7e95a496fc602fa0ac9449fcc5c012c3875de
+  metadata.gz: 085fa926c3d0a3737487d7589b85ab833547bdf19134f544209915742640e5709bcbacef7aaccc76203cdf30068008dabbe509823625072afeb0bfe6d1a04937
+  data.tar.gz: 26cfe6cb8982ed036ed70d4b1aac50ff9c5720d87e3aef3cc87696a1c1cfa3697c31018de546c817aa482ac73f61a1f15f8ac678a0b8d0cabdde520691a4c618

data/.gitignore

@@ -19,6 +19,7 @@ doc/
 
 /tags
 /gems.tags
+/Gemfile.lock
 
 .vagrant
 /cache

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.1
-matrix:
-  allow_failures:
-    - rvm: 2.1.1
+  - 2.2
+  - 2.3
+  - 2.4
+install:
+  - gem install -v 1.12.5 bundler
+  - bundle _1.12.5_ install --jobs=3 --retry=3
 script: "bundle exec rake ci"

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## [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:

data/Gemfile

@@ -1,17 +1,18 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.7.4'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.8.7'
   gem 'guard'
   gem 'guard-rspec'
   gem 'rb-inotify'
 end
 
 group :development, :test do
-  gem 'rake'
-  gem 'rspec',        '2.99.0'
-  gem 'coveralls',    require: (ENV['COVERAGE'] == 'true')
-  gem 'vagrant-spec', git: 'https://github.com/mitchellh/vagrant-spec.git'
+  gem 'rake', '~> 10.4.2'
+  gem 'rspec', '~> 2.99.0'
+  gem 'coveralls', '~> 0.7.2', require: (ENV['COVERAGE'] == 'true')
+  # The is the ref *just* before we switch to childprocess 0.6, which conflicts with vagrant 1.8 deps.
+  gem 'vagrant-spec', git: 'https://github.com/mitchellh/vagrant-spec.git', ref: '5006bc73cd8796465ca09307d4774f8ec8375aa0'
 end
 
 group :plugins do

data/README.md

@@ -2,7 +2,7 @@
 
 [![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)
 
-[LXC](http://lxc.sourceforge.net/) provider for [Vagrant](http://www.vagrantup.com/) 1.6+
+[LXC](http://lxc.sourceforge.net/) provider for [Vagrant](http://www.vagrantup.com/) 1.8+
 
 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
@@ -17,17 +17,14 @@ to see it in action.
 
 ## Requirements
 
-* [Vagrant 1.5+](http://www.vagrantup.com/downloads.html) (tested with 1.7.2)
-* lxc >=0.7.5 and <2.1.0 (see [#445](https://github.com/fgrehm/vagrant-lxc/issues/445))
-* tar 1.27 (the lxc-template script uses the --xattrs option)
+* [Vagrant 1.8+](http://www.vagrantup.com/downloads.html)
+* lxc >=1.0
 * `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+
-hosts and installing the dependencies on it basically means a `apt-get install lxc lxc-templates cgroup-lite redir`
-(older LXC versions like 0.7.5 shipped with Ubuntu 12.04 by default might require
-[additional configurations to work](#backingstore-options)). For setting up other
+hosts and installing the dependencies on it basically means a
+`apt-get install lxc lxc-templates cgroup-lite redir`. For setting up other
 types of hosts please have a look at the [Wiki](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)
@@ -155,16 +152,14 @@ end
 
 ## Avoiding `sudo` passwords
 
-This plugin requires **a lot** of `sudo`ing since [user namespaces](https://wiki.ubuntu.com/UserNamespace)
-is not supported yet. To work around that, you can use the `vagrant lxc sudoers`
+This plugin requires **a lot** of `sudo`ing since [unprivileged containers](https://github.com/fgrehm/vagrant-lxc/issues/312)
+are not supported yet. 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).
 
-_vagrant-lxc < 1.0.0 users, please check this [Wiki page](https://github.com/fgrehm/vagrant-lxc/wiki/Avoiding-%27sudo%27-passwords)_
-
 
 ## More information
 

data/lib/vagrant-lxc/action/boot.rb

@@ -26,9 +26,6 @@ module Vagrant
             config.customize 'mount.entry', '/sys/fs/selinux sys/fs/selinux none bind,ro 0 0'
           end
 
-          # 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=2G 0 0'
-
           env[:ui].info I18n.t("vagrant_lxc.messages.starting")
           env[:machine].provider.driver.start(config.customizations)
 

data/lib/vagrant-lxc/action/create.rb

@@ -19,7 +19,8 @@ module Vagrant
               container_name = generate_container_name(env)
           end
 
-          env[:machine].provider.driver.create(
+          driver = env[:machine].provider.driver
+          driver.create(
             container_name,
             config.backingstore,
             config.backingstore_options,
@@ -27,6 +28,7 @@ module Vagrant
             env[:lxc_template_config],
             env[:lxc_template_opts]
           )
+          driver.update_config_keys
 
           env[:machine].id = container_name
 

data/lib/vagrant-lxc/action/{fetch_ip_with_lxc_attach.rb → fetch_ip_with_lxc_info.rb}

@@ -1,19 +1,17 @@
 module Vagrant
   module LXC
     module Action
-      class FetchIpWithLxcAttach
+      class FetchIpWithLxcInfo
         # 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_attach")
+          @logger = Log4r::Logger.new("vagrant::lxc::action::fetch_ip_with_lxc_info")
         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
@@ -26,7 +24,7 @@ module Vagrant
           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-attach"
+              raise LXC::Errors::ExecuteError, :command => "lxc-info"
             end
           end
           ip
@@ -34,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.attach '/sbin/ip', '-4', 'addr', 'show', 'scope', 'global', 'eth0', namespaces: ['network', 'mount']
-          if output =~ /^\s+inet ([0-9.]+)\/[0-9]+\s+/
+          output = driver.info '-iH'
+          if output =~ /^([0-9.]+)/
             return $1.to_s
           end
         end

data/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)
+          @logger.debug 'Removing temporary files'
+          driver = env[:machine].provider.driver
+          # To prevent host-side data loss, it's important that all mounts under /tmp are unmounted
+          # before we proceed with the `rm -rf` operation. See #68 and #360.
+          driver.attach("findmnt -R /tmp -o TARGET --list --noheadings | xargs -L 1 --no-run-if-empty umount")
+          driver.attach("rm -rf /tmp/*")
+
+          @app.call env
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-lxc/action.rb

@@ -4,8 +4,7 @@ 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_attach'
-require 'vagrant-lxc/action/fetch_ip_from_dnsmasq_leases'
+require 'vagrant-lxc/action/fetch_ip_with_lxc_info'
 require 'vagrant-lxc/action/forced_halt'
 require 'vagrant-lxc/action/forward_ports'
 require 'vagrant-lxc/action/gc_private_network_bridges'
@@ -13,6 +12,7 @@ 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'
 
@@ -125,6 +125,7 @@ module Vagrant
             end
 
             b2.use ClearForwardedPorts
+            b2.use RemoveTemporaryFiles
             b2.use GcPrivateNetworkBridges
             b2.use Builtin::Call, Builtin::GracefulHalt, :stopped, :running do |env2, b3|
               if !env2[:result]
@@ -182,8 +183,7 @@ module Vagrant
       def self.action_ssh_ip
         Builder.new.tap do |b|
           b.use Builtin::Call, Builtin::ConfigValidate do |env, b2|
-            b2.use FetchIpWithLxcAttach if env[:machine].provider.driver.supports_attach?
-            b2.use FetchIpFromDnsmasqLeases
+            b2.use FetchIpWithLxcInfo
           end
         end
       end

data/lib/vagrant-lxc/command/sudoers.rb

@@ -1,6 +1,7 @@
 require 'tempfile'
 
 require "vagrant-lxc/driver"
+require "vagrant-lxc/sudo_wrapper"
 
 module Vagrant
   module LXC
@@ -27,7 +28,7 @@ module Vagrant
           argv = parse_options(opts)
           return unless argv
 
-          wrapper_path = Vagrant::LXC.sudo_wrapper_path
+          wrapper_path = SudoWrapper.dest_path
           wrapper = create_wrapper!
           sudoers = create_sudoers!(options[:user], wrapper_path)
 
@@ -45,7 +46,7 @@ module Vagrant
 
         # This requires vagrant 1.5.2+ https://github.com/mitchellh/vagrant/commit/3371c3716278071680af9b526ba19235c79c64cb
         def create_wrapper!
-          lxc_base_path = Driver.new(0, LXC.sudo_wrapper).containers_path
+          lxc_base_path = Driver.new("").containers_path
           wrapper = Tempfile.new('lxc-wrapper').tap do |file|
             template = Vagrant::Util::TemplateRenderer.new(
               'sudoers.rb',

data/lib/vagrant-lxc/config.rb

@@ -24,7 +24,6 @@ module Vagrant
         @customizations = []
         @backingstore = UNSET_VALUE
         @backingstore_options = []
-        @sudo_wrapper   = UNSET_VALUE
         @container_name = UNSET_VALUE
         @fetch_ip_tries = UNSET_VALUE
       end
@@ -50,7 +49,6 @@ module Vagrant
       end
 
       def finalize!
-        @sudo_wrapper = nil if @sudo_wrapper == UNSET_VALUE
         @container_name = nil if @container_name == UNSET_VALUE
         @backingstore = "best" if @backingstore == UNSET_VALUE
         @existing_container_name = nil if @existing_container_name == UNSET_VALUE

data/lib/vagrant-lxc/driver/cli.rb

@@ -29,7 +29,7 @@ module Vagrant
 
         def version
           return @version if @version
-          @version = support_version_command? ? run(:version) : run(:create, '--version')
+          @version = run(:create, '--version')
           if @version =~ /(lxc version:\s+|)(.+)\s*$/
             @version = $2.downcase
           else
@@ -39,11 +39,11 @@ module Vagrant
         end
 
         def config(param)
-          if support_config_command?
-            run(:config, param).gsub("\n", '')
-          else
-            raise Errors::CommandNotSupported, name: 'config', available_version: '> 1.x.x', version: version
-          end
+          run(:config, param).gsub("\n", '')
+        end
+
+        def update_config(path)
+          run('update-config', '-c', path)
         end
 
         def state
@@ -114,17 +114,17 @@ module Vagrant
             end
 
             if namespaces
-              if supports_attach_with_namespaces?
-                extra = ['--namespaces', namespaces]
-              else
-                raise LXC::Errors::NamespacesNotSupported
-              end
+              extra = ['--namespaces', namespaces]
             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?
 
@@ -155,29 +155,11 @@ module Vagrant
           return @supports_attach
         end
 
-        def support_config_command?
-          version[0].to_i >= 1
-        end
-
-        def support_version_command?
-          @sudo_wrapper.run('which', 'lxc-version').strip.chomp != ''
-        rescue Vagrant::LXC::Errors::ExecuteError
-          return false
-        end
-
         private
 
         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

data/lib/vagrant-lxc/driver.rb

@@ -3,6 +3,7 @@ require "vagrant/util/subprocess"
 
 require "vagrant-lxc/errors"
 require "vagrant-lxc/driver/cli"
+require "vagrant-lxc/sudo_wrapper"
 
 require "etc"
 
@@ -16,15 +17,13 @@ module Vagrant
       class ContainerNotFound < StandardError; end
 
       # Default root folder where container configs are stored
-      DEFAULT_CONTAINERS_PATH = '/var/lib/lxc'
-
       attr_reader :container_name,
                   :customizations
 
-      def initialize(container_name, sudo_wrapper, cli = nil)
+      def initialize(container_name, sudo_wrapper = nil, cli = nil)
         @container_name = container_name
-        @sudo_wrapper   = sudo_wrapper
-        @cli            = cli || CLI.new(sudo_wrapper, container_name)
+        @sudo_wrapper   = sudo_wrapper || SudoWrapper.new()
+        @cli            = cli || CLI.new(@sudo_wrapper, container_name)
         @logger         = Log4r::Logger.new("vagrant::provider::lxc::driver")
         @customizations = []
       end
@@ -35,7 +34,7 @@ module Vagrant
 
       # Root folder where container configs are stored
       def containers_path
-        @containers_path ||= @cli.support_config_command? ? @cli.config('lxc.lxcpath') : DEFAULT_CONTAINERS_PATH
+        @containers_path ||= @cli.config('lxc.lxcpath')
       end
 
       def all_containers
@@ -46,6 +45,10 @@ module Vagrant
         Pathname.new("#{containers_path}/#{@container_name}")
       end
 
+      def config_path
+        base_path.join('config').to_s
+      end 
+
       def rootfs_path
         config_entry = config_string.match(/^lxc\.rootfs\s+=\s+(.+)$/)[1]
         case config_entry
@@ -73,7 +76,7 @@ module Vagrant
       end
 
       def config_string
-        @sudo_wrapper.run('cat', base_path.join('config').to_s)
+        @sudo_wrapper.run('cat', config_path)
       end
 
       def create(name, backingstore, backingstore_options, template_path, config_file, template_options = {})
@@ -126,6 +129,10 @@ 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
@@ -237,6 +244,12 @@ module Vagrant
         write_config(contents)
       end
 
+      def update_config_keys
+        @cli.update_config(config_path)
+      rescue Errors::ExecuteError
+        # not on LXC 2.1+. Doesn't matter, ignore.
+      end
+
       protected
 
       def write_customizations(customizations)
@@ -257,8 +270,8 @@ module Vagrant
           file.chmod 0644
           file.write contents
           file.close
-          @sudo_wrapper.run 'cp', '-f', file.path, base_path.join('config').to_s
-          @sudo_wrapper.run 'chown', 'root:root', base_path.join('config').to_s
+          @sudo_wrapper.run 'cp', '-f', file.path, config_path
+          @sudo_wrapper.run 'chown', 'root:root', config_path
         end
       end
     end

data/lib/vagrant-lxc/errors.rb

@@ -25,9 +25,6 @@ module Vagrant
       end
 
 
-      class NamespacesNotSupported < Vagrant::Errors::VagrantError
-      end
-
       class LxcLinuxRequired < Vagrant::Errors::VagrantError
         error_key(:lxc_linux_required)
       end

data/lib/vagrant-lxc/provider.rb

@@ -2,6 +2,7 @@ require "log4r"
 
 require "vagrant-lxc/action"
 require "vagrant-lxc/driver"
+require "vagrant-lxc/sudo_wrapper"
 
 module Vagrant
   module LXC
@@ -24,13 +25,9 @@ module Vagrant
         machine_id_changed
       end
 
-      def sudo_wrapper
-        @shell ||= LXC.sudo_wrapper
-      end
-
       def ensure_lxc_installed!
         begin
-          sudo_wrapper.run("which", "lxc-create")
+          SudoWrapper.new().run("which", "lxc-create")
         rescue Vagrant::LXC::Errors::ExecuteError
           raise Errors::LxcNotInstalled
         end
@@ -43,7 +40,7 @@ module Vagrant
 
         begin
           @logger.debug("Instantiating the container for: #{id.inspect}")
-          @driver = Driver.new(id, self.sudo_wrapper)
+          @driver = Driver.new(id)
           @driver.validate!
         rescue Driver::ContainerNotFound
           # The container doesn't exist, so we probably have a stale

data/lib/vagrant-lxc/sudo_wrapper.rb

@@ -6,8 +6,12 @@ module Vagrant
 
       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()
+        @wrapper_path = Pathname.new(SudoWrapper.dest_path).exist? && SudoWrapper.dest_path || nil
         @logger       = Log4r::Logger.new("vagrant::lxc::sudo_wrapper")
       end
 

data/lib/vagrant-lxc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module LXC
-    VERSION = "1.2.4"
+    VERSION = "1.3.0"
   end
 end

data/lib/vagrant-lxc.rb

@@ -1,22 +1,10 @@
 require "vagrant-lxc/version"
 require "vagrant-lxc/plugin"
-require "vagrant-lxc/sudo_wrapper"
 
 module Vagrant
   module LXC
     def self.source_root
       @source_root ||= Pathname.new(File.dirname(__FILE__)).join('..').expand_path
     end
-
-    def self.sudo_wrapper_path
-      "/usr/local/bin/vagrant-lxc-wrapper"
-    end
-
-    def self.sudo_wrapper
-      wrapper = Pathname.new(sudo_wrapper_path).exist? &&
-        sudo_wrapper_path || nil
-      SudoWrapper.new(wrapper)
-    end
-
   end
 end

data/scripts/lxc-template

@@ -110,7 +110,6 @@ fi
 # Unpack the rootfs
 echo "Unpacking the rootfs"
 
-mkdir -p /var/lock/subsys
 (
     flock -x 200
     if [ $? -ne 0 ]; then
@@ -119,13 +118,14 @@ mkdir -p /var/lock/subsys
     fi
 
     mkdir -p ${LXC_ROOTFS}
-    (cd ${LXC_ROOTFS} && tar xfz ${LXC_TARBALL} --strip-components=${LXC_STRIP_COMPONENTS} --xattrs --xattrs-include=*)
-    if [ $? -ne 0 ]; then
+    (cd ${LXC_ROOTFS} && tar xfz ${LXC_TARBALL} --strip-components=${LXC_STRIP_COMPONENTS} --xattrs --xattrs-include=* || true)
+    if [ ! -f ${LXC_ROOTFS}/bin/true ]; then
         echo "Failed to extract rootfs"
         exit 1
     fi
 
-) 200>/var/lock/subsys/lxc
+) 200>${LXC_PATH}/vagrant_lock
+rm ${LXC_PATH}/vagrant_lock
 
 mkdir -p ${LXC_ROOTFS}/dev/pts/
 

data/spec/Vagrantfile

@@ -15,10 +15,6 @@ 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'
 

data/spec/unit/driver/cli_spec.rb

@@ -30,16 +30,7 @@ describe Vagrant::LXC::Driver::CLI do
 
   describe 'version' do
     before do
-      allow(subject).to receive(:support_version_command?).and_return(true)
-      allow(subject).to receive(:run).with(:version).and_return(lxc_version_out)
-    end
-
-    describe 'lxc version before 1.x.x' do
-      let(:lxc_version_out) { "lxc version:  0.x.y-rc1\n" }
-
-      it 'parses the version from the output' do
-        expect(subject.version).to eq('0.x.y-rc1')
-      end
+      allow(subject).to receive(:run).with(:create, '--version').and_return(lxc_version_out)
     end
 
     describe 'lxc version after 1.x.x' do
@@ -53,24 +44,11 @@ describe Vagrant::LXC::Driver::CLI do
 
   describe 'config' do
     before do
-      allow(subject).to receive(:support_version_command?).and_return(support_version_command?)
       allow(subject).to receive(:run).with(:config, 'lxc.lxcpath').and_return(lxc_config_out)
-      allow(subject).to receive(:run).with(:version).and_return(lxc_version_out)
       allow(subject).to receive(:run).with(:create, '--version').and_return(lxc_version_out)
     end
 
-    describe 'lxc version before 1.x.x' do
-      let(:support_version_command?) { true }
-      let(:lxc_config_out)           { "/var/lib/lxc\n" }
-      let(:lxc_version_out)          { "lxc version:  0.x.y-rc1\n" }
-
-      it 'not supported' do
-        expect{subject.config('lxc.lxcpath')}.to raise_error(Vagrant::LXC::Errors::CommandNotSupported)
-      end
-    end
-
-    describe 'lxc version before after 1.x.x'do
-      let(:support_version_command?) { false }
+    describe 'lxc version after 1.x.x'do
       let(:lxc_config_out)           { "/var/lib/lxc\n" }
       let(:lxc_version_out)          { "1.0.0\n" }
 
@@ -232,13 +210,6 @@ 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

data/spec/unit/driver_spec.rb

@@ -89,7 +89,7 @@ describe Vagrant::LXC::Driver do
   describe 'start' do
     let(:customizations)         { [['a', '1'], ['b', '2']] }
     let(:internal_customization) { ['internal', 'customization'] }
-    let(:cli)                    { double(Vagrant::LXC::Driver::CLI, start: true, support_config_command?: false) }
+    let(:cli)                    { double(Vagrant::LXC::Driver::CLI, start: true) }
     let(:sudo)                   { double(Vagrant::LXC::SudoWrapper) }
 
     subject { described_class.new('name', sudo, cli) }
@@ -99,6 +99,7 @@ describe Vagrant::LXC::Driver do
         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)
@@ -152,21 +153,11 @@ describe Vagrant::LXC::Driver do
   end
 
   describe 'containers_path' do
-    let(:cli) { double(Vagrant::LXC::Driver::CLI, config: cli_config_value, support_config_command?: cli_support_config_command_value) }
+    let(:cli) { double(Vagrant::LXC::Driver::CLI, config: cli_config_value) }
 
     subject { described_class.new('name', nil, cli) }
 
-    describe 'lxc version before 1.x.x' do
-      let(:cli_support_config_command_value) { false }
-      let(:cli_config_value)                 { '/var/lib/lxc' }
-
-      it 'delegates to cli' do
-        expect(subject.containers_path).to eq(cli_config_value)
-      end
-    end
-
     describe 'lxc version after 1.x.x' do
-      let(:cli_support_config_command_value) { true }
       let(:cli_config_value)                 { '/etc/lxc' }
 
       it 'delegates to cli' do

data/templates/sudoers.rb.erb

@@ -109,6 +109,7 @@ Whitelist.add_regex %r{<%= pipework_regex %>}, '**'
 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', /.*/
@@ -118,6 +119,7 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-01-20 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -25,7 +25,6 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
@@ -38,8 +37,7 @@ files:
 - lib/vagrant-lxc/action/create.rb
 - lib/vagrant-lxc/action/destroy.rb
 - lib/vagrant-lxc/action/destroy_confirm.rb
-- lib/vagrant-lxc/action/fetch_ip_from_dnsmasq_leases.rb
-- lib/vagrant-lxc/action/fetch_ip_with_lxc_attach.rb
+- lib/vagrant-lxc/action/fetch_ip_with_lxc_info.rb
 - lib/vagrant-lxc/action/forced_halt.rb
 - lib/vagrant-lxc/action/forward_ports.rb
 - lib/vagrant-lxc/action/gc_private_network_bridges.rb
@@ -47,6 +45,7 @@ files:
 - lib/vagrant-lxc/action/prepare_nfs_settings.rb
 - lib/vagrant-lxc/action/prepare_nfs_valid_ids.rb
 - lib/vagrant-lxc/action/private_networks.rb
+- lib/vagrant-lxc/action/remove_temporary_files.rb
 - lib/vagrant-lxc/action/setup_package_files.rb
 - lib/vagrant-lxc/action/warn_networks.rb
 - lib/vagrant-lxc/command/root.rb

data/Gemfile.lock

@@ -1,182 +0,0 @@
-GIT
-  remote: https://github.com/fgrehm/vagrant-cachier.git
-  revision: 40dddfb368526948e769492a00a7937c5a044a4d
-  specs:
-    vagrant-cachier (1.2.1)
-
-GIT
-  remote: https://github.com/fgrehm/vagrant-pristine.git
-  revision: 6d044265db17451c606f000bf43437e95a742bb4
-  specs:
-    vagrant-pristine (0.3.0)
-
-GIT
-  remote: https://github.com/mitchellh/vagrant-spec.git
-  revision: 1df5a3af81cb7cce568b2eac52b8f6822bcb1d8e
-  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: 78ea5e4a78ce644717ab16d8001ab77430168f0f
-  tag: v1.7.4
-  specs:
-    vagrant (1.7.4)
-      bundler (>= 1.5.2, <= 1.10.5)
-      childprocess (~> 0.5.0)
-      erubis (~> 2.7.0)
-      hashicorp-checkpoint (~> 0.1.1)
-      i18n (>= 0.6.0, <= 0.8.0)
-      listen (~> 3.0.2)
-      log4r (~> 1.1.9, < 1.1.11)
-      net-scp (~> 1.1.0)
-      net-sftp (~> 2.1)
-      net-ssh (>= 2.6.6, < 2.10.0)
-      nokogiri (= 1.6.3.1)
-      rb-kqueue (~> 0.2.0)
-      rest-client (>= 1.6.0, < 2.0)
-      wdm (~> 0.1.0)
-      winrm (~> 1.3)
-      winrm-fs (~> 0.2.0)
-
-PATH
-  remote: .
-  specs:
-    vagrant-lxc (1.2.4)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    builder (3.2.2)
-    childprocess (0.5.6)
-      ffi (~> 1.0, >= 1.0.11)
-    coderay (1.1.0)
-    coveralls (0.7.2)
-      multi_json (~> 1.3)
-      rest-client (= 1.6.7)
-      simplecov (>= 0.7)
-      term-ansicolor (= 1.2.2)
-      thor (= 0.18.1)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    erubis (2.7.0)
-    ffi (1.9.10)
-    formatador (0.2.5)
-    gssapi (1.2.0)
-      ffi (>= 1.0.1)
-    guard (2.12.8)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, <= 4.0)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.6.2)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    gyoku (1.3.1)
-      builder (>= 2.1.2)
-    hashicorp-checkpoint (0.1.4)
-    httpclient (2.6.0.1)
-    i18n (0.7.0)
-    json (1.8.3)
-    listen (3.0.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    little-plugger (1.1.3)
-    log4r (1.1.10)
-    logging (1.8.2)
-      little-plugger (>= 1.1.3)
-      multi_json (>= 1.8.4)
-    lumberjack (1.0.9)
-    method_source (0.8.2)
-    mime-types (2.6.1)
-    mini_portile (0.6.0)
-    multi_json (1.11.2)
-    nenv (0.2.0)
-    net-scp (1.1.2)
-      net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    nori (2.6.0)
-    notiffany (0.0.6)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rake (10.4.2)
-    rb-fsevent (0.9.5)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.4)
-      ffi (>= 0.5.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.2)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.4)
-    rubyntlm (0.4.0)
-    rubyzip (1.1.7)
-    shellany (0.0.1)
-    simplecov (0.10.0)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slop (3.6.0)
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
-    thor (0.18.1)
-    tins (0.13.2)
-    uuidtools (2.1.5)
-    vagrant-omnibus (1.4.1)
-    wdm (0.1.1)
-    winrm (1.3.3)
-      builder (>= 2.1.2)
-      gssapi (~> 1.2)
-      gyoku (~> 1.0)
-      httpclient (~> 2.2, >= 2.2.0.2)
-      logging (~> 1.6, >= 1.6.1)
-      nori (~> 2.0)
-      rubyntlm (~> 0.4.0)
-      uuidtools (~> 2.1.2)
-    winrm-fs (0.2.0)
-      erubis (~> 2.7)
-      logging (~> 1.6, >= 1.6.1)
-      rubyzip (~> 1.1)
-      winrm (~> 1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  coveralls
-  guard
-  guard-rspec
-  rake
-  rb-inotify
-  rspec (= 2.99.0)
-  vagrant!
-  vagrant-cachier!
-  vagrant-lxc!
-  vagrant-omnibus
-  vagrant-pristine!
-  vagrant-spec!

data/lib/vagrant-lxc/action/fetch_ip_from_dnsmasq_leases.rb

@@ -1,49 +0,0 @@
-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.to_s}\s+([0-9.]+)\s+/i
-              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