vagrant-lxc 1.0.0.alpha.1 → 1.0.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51c1ffd96f522003bc67e527711bbb7c3e47581e
-  data.tar.gz: 13fe22e65136a8409f05bf321202d05952d185c8
+  metadata.gz: f16ecc96c3d6f94a025db26d4fa9acfdbd29f153
+  data.tar.gz: 67475bf75d68f60d9a45f913258fc08e4d3d57c9
 SHA512:
-  metadata.gz: 4910e182e07740f92222861344cd4f87bd092361dde180639e59aaae37762d314ff24402d268d03359db9519ccc5b465dc4c0b5d570d8bc4e4793b50fa57c662
-  data.tar.gz: 81d2ace93c821bf408730e76d06efa94dcf7e8358d794a72324d42a9d90d791dd4549531923662cfa10df13b6fc9d5cf8333460352009e2dee158a99e2d797ec
+  metadata.gz: 43322e18345da08c92c6beb2a0a8c38cf33dacd4b6b2f05c4222333a23c2e6a39ad25a4fa61d022355d8ab3b6e57de7bbfe0b7d83958a56b5c71d5131038a30c
+  data.tar.gz: ee9ed4e6f30c100a21a07e57bc7eb9ee83f88aa12d8e8d8927e0dff8b26bf5f9bdeb5f05cf72e8c3ffc8f0bc7763531342fd5de660ef38326a61acbcd26aaa40

data/CHANGELOG.md

@@ -1,4 +1,42 @@
-## [1.0.0.alpha.1](https://github.com/fgrehm/vagrant-lxc/compare/v0.8.0...v1.0.0.alpha.1) (Mar 04, 2014)
+## [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:
 

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.5.1'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
   gem 'guard'
   gem 'guard-rspec'
   gem 'rb-inotify'

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/fgrehm/vagrant-cachier.git
-  revision: 2df1e319408a7e6f1c6e75d48e36591199e98527
+  revision: 6e160ba4cbfc197f8fff1db385fb9d6b9463eba1
   specs:
-    vagrant-cachier (0.6.1.dev)
+    vagrant-cachier (0.7.2)
 
 GIT
   remote: https://github.com/fgrehm/vagrant-pristine.git
@@ -12,7 +12,7 @@ GIT
 
 GIT
   remote: https://github.com/mitchellh/vagrant-spec.git
-  revision: aae28ee57071cdd121ca782c6e0709a5c650a4be
+  revision: c0dafc996165bf1628b672dd533f1858ff66fe4a
   specs:
     vagrant-spec (0.0.1)
       childprocess (~> 0.5.0)
@@ -22,32 +22,39 @@ GIT
 
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: 6977e93ba98fd19112b1fed74dafb8619f581984
-  tag: v1.5.1
+  revision: 9475ed9a50650b88db444ac07a7034775d3b814e
   specs:
-    vagrant (1.5.1)
-      bundler (~> 1.5.2)
+    vagrant (1.6.2)
+      bundler (>= 1.5.2, < 1.7.0)
       childprocess (~> 0.5.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
-      listen (~> 2.4.0)
+      listen (~> 2.7.1)
       log4r (~> 1.1.9, < 1.1.11)
       net-scp (~> 1.1.0)
-      net-ssh (>= 2.6.6, < 2.8.0)
+      net-ssh (>= 2.6.6, < 2.10.0)
       rb-kqueue (~> 0.2.0)
       wdm (~> 0.1.0)
+      winrm (~> 1.1.3)
 
 PATH
   remote: .
   specs:
-    vagrant-lxc (1.0.0.alpha.1)
+    vagrant-lxc (1.0.0.alpha.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    akami (1.2.2)
+      gyoku (>= 0.4.0)
+      nokogiri
+    builder (3.2.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    childprocess (0.5.1)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
+    childprocess (0.5.3)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
     coveralls (0.7.0)
@@ -61,35 +68,53 @@ GEM
     erubis (2.7.0)
     ffi (1.9.3)
     formatador (0.2.4)
-    guard (2.4.0)
+    gssapi (1.0.3)
+      ffi (>= 1.0.1)
+    guard (2.6.1)
       formatador (>= 0.2.4)
-      listen (~> 2.1)
+      listen (~> 2.7)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-rspec (4.2.8)
+    guard-rspec (4.2.9)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
+    gyoku (1.1.1)
+      builder (>= 2.1.2)
+    httpclient (2.3.4.1)
+    httpi (0.9.7)
+      rack
     i18n (0.6.9)
-    listen (2.4.1)
+    listen (2.7.4)
       celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
+    little-plugger (1.1.3)
     log4r (1.1.10)
-    lumberjack (1.0.4)
+    logging (1.8.2)
+      little-plugger (>= 1.1.3)
+      multi_json (>= 1.8.4)
+    lumberjack (1.0.5)
     method_source (0.8.2)
-    mime-types (2.1)
-    multi_json (1.9.0)
+    mime-types (2.2)
+    mini_portile (0.5.3)
+    multi_json (1.10.0)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.7.0)
+    net-ssh (2.9.0)
+    nio4r (1.0.0)
+    nokogiri (1.6.2)
+      mini_portile (~> 0.5.2)
+    nori (1.1.5)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rake (10.1.1)
+    rack (1.5.2)
+    rake (10.3.1)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rb-inotify (0.9.4)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.2)
       ffi (>= 0.5.0)
@@ -103,6 +128,15 @@ GEM
     rspec-expectations (2.99.0.beta2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.0.beta2)
+    rubyntlm (0.1.1)
+    savon (0.9.5)
+      akami (~> 1.0)
+      builder (>= 2.1.2)
+      gyoku (>= 0.4.0)
+      httpi (~> 0.9)
+      nokogiri (>= 1.4.0)
+      nori (~> 1.0)
+      wasabi (~> 1.0)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -113,9 +147,20 @@ GEM
       tins (~> 1.0)
     thor (0.18.1)
     timers (1.1.0)
-    tins (1.0.0)
-    vagrant-omnibus (1.3.1)
+    tins (1.2.0)
+    uuidtools (2.1.4)
+    vagrant-omnibus (1.4.1)
+    wasabi (1.0.0)
+      nokogiri (>= 1.4.0)
     wdm (0.1.0)
+    winrm (1.1.3)
+      gssapi (~> 1.0.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (~> 1.6, >= 1.6.1)
+      nokogiri (~> 1.5)
+      rubyntlm (~> 0.1.1)
+      savon (= 0.9.5)
+      uuidtools (~> 2.1.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -13,13 +13,6 @@ to see it in action.
 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
 
@@ -36,15 +29,12 @@ will be coming along _soon_.
 * `redir` (if you are planning to use port forwarding)
 * 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 12.04+
+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`
 and a `apt-get update && apt-get dist-upgrade` to upgrade the kernel. For Debian
-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) :)
+hosts you'll need to follow the instructions described on the [Wiki](https://github.com/fgrehm/vagrant-lxc/wiki/Usage-on-debian-hosts)
+and old lxc versions (like 0.7.5 shipped with Ubuntu 12.04 by default) might require
+[additional configurations to work](#backingstore-options).
 
 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)
@@ -56,6 +46,14 @@ disable checksum offloading as described on [this comment](https://github.com/fg
 
 ## Installation
 
+On Vagrant 1.5+:
+
+```
+vagrant plugin install vagrant-lxc --plugin-version 1.0.0.alpha.2
+```
+
+On Vagrant < 1.5:
+
 ```
 vagrant plugin install vagrant-lxc
 ```
@@ -82,7 +80,16 @@ environmental variable to `lxc` in order to avoid typing `--provider=lxc` all
 the time.
 
 
-### Advanced configuration
+## 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.
+
+
+## Advanced configuration
 
 If you want, you can modify container configurations from within your Vagrantfile
 using the [provider block](http://docs.vagrantup.com/v2/providers/configuration.html):
@@ -111,8 +118,6 @@ 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,26 +127,48 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+### Backingstore options
+
+Support for setting `lxc-create`'s backingstore option (`-B` and related) can be
+specified from the provider block and it defaults to `best`, to change it:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provider :lxc do |lxc|
+    lxc.backingstore = 'lvm' # or 'btrfs',...
+    # lvm specific options
+    lxc.backingstore_option '--vgname', 'schroots'
+    lxc.backingstore_option '--fssize', '5G'
+    lxc.backingstore_option '--fstype', 'xfs'
+  end
+end
+```
+
+For old versions of lxc (like 0.7.5 shipped with Ubuntu 12.04 by default) that
+does not support `best` for the backingstore option, changing it to `none` is
+required and a default for all Vagrant environments can be set from your
+`~/.vagrant.d/Vagrantfile` using the same `provider` block:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provider :lxc do |lxc|
+    lxc.backingstore = 'none'
+  end
+end
+```
+
 ### Avoiding `sudo` passwords
 
 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
-`vagrant lxc sudoers` command which will create a file under `/etc/sudoers.d/vagrant-lxc-<USER>`
+`vagrant lxc sudoers` command which will create a file under `/etc/sudoers.d/vagrant-lxc-<VERSION>`
 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/commands/sudoers.rb#L58-L81).
+[this code](lib/vagrant-lxc/commands/sudoers.rb).
 
 _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
 

data/lib/vagrant-lxc.rb

@@ -6,5 +6,9 @@ module Vagrant
     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-#{VERSION}"
+    end
   end
 end

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

@@ -14,6 +14,12 @@ module Vagrant
           utsname = env[:machine].config.vm.hostname || env[:machine].id
           config.customize 'utsname', utsname
 
+          # 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
+
           env[:ui].info I18n.t("vagrant_lxc.messages.starting")
           env[:machine].provider.driver.start(config.customizations)
 

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

@@ -13,9 +13,13 @@ 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)
-              @logger.debug "Killing pid #{pid}"
-              system "pkill -TERM -P #{pid}"
+              next unless is_redir_pid?(pid[0])
+              @logger.debug "Killing pid #{pid[0]}"
+              if pid[1]
+                system "sudo pkill -TERM -P #{pid[0]}"
+              else
+                system "pkill -TERM -P #{pid[0]}"
+              end
             end
 
             @logger.info "Removing redir pids files"
@@ -31,7 +35,8 @@ module Vagrant
 
         def redir_pids
           @redir_pids = Dir[@env[:machine].data_dir.join('pids').to_s + "/redir_*.pid"].map do |file|
-            File.read(file).strip.chomp
+            port_number = File.basename(file).split(/[^\d]/).join
+            [ File.read(file).strip.chomp , Integer(port_number) <= 1024 ]
           end
         end
 

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

@@ -7,7 +7,8 @@ module Vagrant
         end
 
         def call(env)
-          container_name = env[:machine].provider_config.container_name
+          config = env[:machine].provider_config
+          container_name = config.container_name
 
           case container_name
             when :machine
@@ -24,6 +25,8 @@ module Vagrant
 
           env[:machine].provider.driver.create(
             container_name,
+            config.backingstore,
+            config.backingstore_options,
             env[:lxc_template_src],
             env[:lxc_template_config],
             env[:lxc_template_opts]

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

@@ -19,7 +19,7 @@ module Vagrant
             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+/
+            if dnsmasq_leases =~ /#{Regexp.escape mac_address.to_s}\s+([0-9.]+)\s+/i
               ip = $1.to_s
               break
             else