vagrant-lxc 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b633ab22ce6deadea3b2b3d25a2a74052c02acf9
-  data.tar.gz: 94b3ccfec12f25d33dc0e14bcd95fce6ae5b8399
+  metadata.gz: be12d8c8e72a9909dec8bf1a588338dcba483bbc
+  data.tar.gz: 4331cfda3e8612bf69e4090c383967508387acb6
 SHA512:
-  metadata.gz: d8630c4edd319dcc1220b3c9cd051f1f6fdaa665acf0083a7b414b71a85650b3c53419a32da4aa6ef792325c1e8c066e3a48db760e9c36111f246fc3a6a4e963
-  data.tar.gz: 7a2214f974b67cde3fb876ddf29c459677299941792978e025102ae42b03ad736222f0f7655f8e57a3809d65e073d61996d13241877f7dbc576ae3088a06841d
+  metadata.gz: 48107a2da8b24576f1af4999374f96819441332de0fffeed7602554347aed266a4f15e0f3d07e821b16fb54eb3d888b1556cd2db32ecfda3416415e00191fde0
+  data.tar.gz: 7e40658d9a437855025e71b57c9ee82f25e532cc439410763adaa312c5abf2852571552159bd183cedfde9c92bf7e95a496fc602fa0ac9449fcc5c012c3875de

data/CHANGELOG.md

@@ -1,19 +1,44 @@
+## [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)
@@ -31,6 +56,7 @@ IMPROVEMENTS:
   - 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

data/Gemfile.lock

@@ -46,7 +46,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxc (1.2.3)
+    vagrant-lxc (1.2.4)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -18,7 +18,7 @@ to see it in action.
 ## Requirements
 
 * [Vagrant 1.5+](http://www.vagrantup.com/downloads.html) (tested with 1.7.2)
-* lxc 0.7.5+
+* 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)
 * `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`)

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

@@ -1,5 +1,7 @@
 require 'tempfile'
 
+require "vagrant-lxc/driver"
+
 module Vagrant
   module LXC
     module Command
@@ -43,12 +45,14 @@ 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
           wrapper = Tempfile.new('lxc-wrapper').tap do |file|
             template = Vagrant::Util::TemplateRenderer.new(
               'sudoers.rb',
               :template_root  => Vagrant::LXC.source_root.join('templates').to_s,
               :cmd_paths      => build_cmd_paths_hash,
-              :pipework_regex => "#{ENV['HOME']}/\.vagrant\.d/gems/gems/vagrant-lxc.+/scripts/pipework"
+              :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
@@ -80,9 +84,9 @@ module Vagrant
         def build_cmd_paths_hash
           {}.tap do |hash|
             %w( which cat mkdir cp chown chmod rm tar chown ip ifconfig brctl ).each do |cmd|
-              hash[cmd] = `which #{cmd}`.strip
+              hash[cmd] = `sudo which #{cmd}`.strip
             end
-            hash['lxc_bin'] = Pathname(`which lxc-create`.strip).parent.to_s
+            hash['lxc_bin'] = Pathname(`sudo which lxc-create`.strip).parent.to_s
             hash['ruby'] = Gem.ruby
           end
         end

data/lib/vagrant-lxc/errors.rb

@@ -16,6 +16,15 @@ module Vagrant
         end
       end
 
+      # Raised when user interrupts a subprocess
+      class SubprocessInterruptError < Vagrant::Errors::VagrantError
+        error_key(:lxc_interrupt_error)
+        def initialize(message, *args)
+          super
+        end
+      end
+
+
       class NamespacesNotSupported < Vagrant::Errors::VagrantError
       end
 

data/lib/vagrant-lxc/provider.rb

@@ -2,7 +2,6 @@ require "log4r"
 
 require "vagrant-lxc/action"
 require "vagrant-lxc/driver"
-require "vagrant-lxc/sudo_wrapper"
 
 module Vagrant
   module LXC
@@ -26,12 +25,7 @@ module Vagrant
       end
 
       def sudo_wrapper
-        @shell ||= begin
-          wrapper = Pathname.new(LXC.sudo_wrapper_path).exist? &&
-            LXC.sudo_wrapper_path || nil
-          @logger.debug("Found sudo wrapper : #{wrapper}") if wrapper
-          SudoWrapper.new(wrapper)
-        end
+        @shell ||= LXC.sudo_wrapper
       end
 
       def ensure_lxc_installed!

data/lib/vagrant-lxc/sudo_wrapper.rb

@@ -13,11 +13,24 @@ module Vagrant
 
       def run(*command)
         options = command.last.is_a?(Hash) ? command.last : {}
-        if @wrapper_path && !options[:no_wrapper]
-          command.unshift @wrapper_path
-          execute *(['sudo'] + command)
-        else
-          execute *(['sudo', '/usr/bin/env'] + command)
+
+        # 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 @wrapper_path && !options[:no_wrapper]
+            command.unshift @wrapper_path
+            execute *(['sudo'] + command)
+          else
+            execute *(['sudo', '/usr/bin/env'] + command)
+          end
+        ensure
+          File.umask(old_mask)
         end
       end
 
@@ -46,7 +59,7 @@ module Vagrant
           # nicely handled by Vagrant.
           if r.exit_code != 0
             if @interrupted
-              @logger.info("Exit code != 0, but interrupted. Ignoring.")
+              raise LXC::Errors::SubprocessInterruptError, command.inspect
             else
               raise LXC::Errors::ExecuteError,
                 command: command.inspect, stderr: r.stderr, stdout: r.stdout, exitcode: r.exit_code

data/lib/vagrant-lxc/version.rb

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

data/lib/vagrant-lxc.rb

@@ -1,5 +1,6 @@
 require "vagrant-lxc/version"
 require "vagrant-lxc/plugin"
+require "vagrant-lxc/sudo_wrapper"
 
 module Vagrant
   module LXC
@@ -10,5 +11,12 @@ module Vagrant
     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/locales/en.yml

@@ -40,6 +40,9 @@ en:
           preparing: Setting up mount entries for shared folders...
 
     errors:
+      lxc_interrupt_error: |-
+        Interrupted
+
       lxc_execute_error: |-
         There was an error executing %{command}
 

data/scripts/lxc-template

@@ -96,11 +96,6 @@ if [ -z "${LXC_PATH}" ]; then
     exit 1
 fi
 
-if [ -z "${LXC_CONFIG}" ]; then
-    echo "'config' 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
@@ -160,11 +155,13 @@ if [ -e "${LXC_PATH}/config-network" ]; then
     rm ${LXC_PATH}/config-network
 fi
 
-## Append the defaults
-echo "" >> ${LXC_PATH}/config
-echo "##############################################" >> ${LXC_PATH}/config
-echo "# vagrant-lxc base box specific configuration" >> ${LXC_PATH}/config
-cat ${LXC_CONFIG} >> ${LXC_PATH}/config
+if [ -n "${LXC_CONFIG}" ]; then
+    ## Append the defaults
+    echo "" >> ${LXC_PATH}/config
+    echo "##############################################" >> ${LXC_PATH}/config
+    echo "# vagrant-lxc base box specific configuration" >> ${LXC_PATH}/config
+    cat ${LXC_CONFIG} >> ${LXC_PATH}/config
+fi
 
 # Empty section for lxc.customize calls from vagrantfile
 echo "" >> ${LXC_PATH}/config

data/templates/sudoers.rb.erb

@@ -78,7 +78,7 @@ class Whitelist
   end
 end
 
-base = "/var/lib/lxc"
+base = "<%= lxc_base_path %>"
 base_path = %r{\A#{base}/.*\z}
 
 ##

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Linux Containers provider for Vagrant