vagrant-lxc 1.0.0.alpha.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd50ec26aecfabf94b58e9f16ff0a996fc6d7598
-  data.tar.gz: ae1c22bb9caf6b7b233d0acc100437619f3b5728
+  metadata.gz: ec70712d1aa228167002b92b029e5d2e11f5b61e
+  data.tar.gz: 3f38fbed1265b8075f47951fb4d9ea4ef5c0878f
 SHA512:
-  metadata.gz: 1235a0aa274186d0181eadda1f1491ecde4484f96dfc1f50a6b313621da5cd35ce06f75d43dc4a74281c27e55aabc65949187c7abe3f484a9e574f191b8fe536
-  data.tar.gz: 91a879e4104ea0c7e2104c36e91147037ba76f0a3c37e79e7cc9f2e4e3a5ec279b39d6b99f84f12399bae2c24ec38ed8a2dab47957f4dc356b0bb8d36e075f85
+  metadata.gz: aa5ed8deeeb23cf12fbd93fbd719e6be1b62faf8b775c4bd1fff4046784a962f684643d22ce80f65f20bbb2ca84852f5d3d025dc21c91367a367a2dfe817dec7
+  data.tar.gz: e1263666e742eb120e13516e593765dddcfc5f2efb302682be69398f2ace2b0d6da69465707a5e7291700e2f5f56c34d0253c58ee3508294621290a6222cd239

data/CHANGELOG.md

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

data/Gemfile.lock

@@ -40,7 +40,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxc (1.0.0.alpha.3)
+    vagrant-lxc (1.0.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -46,14 +46,6 @@ 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.3
-```
-
-On Vagrant < 1.5:
-
 ```
 vagrant plugin install vagrant-lxc
 ```
@@ -61,23 +53,13 @@ vagrant plugin install vagrant-lxc
 
 ## Quick start
 
-On Vagrant 1.5+:
-
 ```
 vagrant init fgrehm/precise64-lxc
 vagrant up --provider=lxc
 ```
 
-On Vagrant < 1.5:
-
-```
-vagrant init precise64 http://bit.ly/vagrant-lxc-precise64-2013-10-23
-vagrant up --provider=lxc
-```
-
-If you are using Vagrant 1.2+ you can also set the `VAGRANT_DEFAULT_PROVIDER`
-environmental variable to `lxc` in order to avoid typing `--provider=lxc` all
-the time.
+_Set the `VAGRANT_DEFAULT_PROVIDER` environmental variable to `lxc` in order to
+avoid typing `--provider=lxc` all the time._
 
 
 ## Base boxes

data/lib/vagrant-lxc.rb

@@ -8,7 +8,7 @@ module Vagrant
     end
 
     def self.sudo_wrapper_path
-      "/usr/local/bin/vagrant-lxc-wrapper-#{VERSION}"
+      "/usr/local/bin/vagrant-lxc-wrapper"
     end
   end
 end

data/lib/vagrant-lxc/action.rb

@@ -101,6 +101,7 @@ 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]

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

@@ -36,7 +36,7 @@ module Vagrant
         end
 
         def sudoers_path
-          "/etc/sudoers.d/vagrant-lxc-#{Vagrant::LXC::VERSION.gsub( /\./, '-')}"
+          "/etc/sudoers.d/vagrant-lxc"
         end
 
         private

data/lib/vagrant-lxc/synced_folder.rb

@@ -46,6 +46,27 @@ 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

data/lib/vagrant-lxc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module LXC
-    VERSION = "1.0.0.alpha.3"
+    VERSION = "1.0.0"
   end
 end

data/scripts/lxc-template

@@ -33,6 +33,7 @@ LXC_PATH=
 LXC_ROOTFS=
 LXC_TARBALL=
 LXC_CONFIG=
+LXC_STRIP_COMPONENTS=2
 
 usage() {
     cat <<EOF
@@ -51,11 +52,12 @@ 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:,help:,name:,path:,rootfs:,mapped-uid:,mapped-gid: -- "$@")SS
+options=$(getopt -o h -l tarball:,config:,help:,name:,path:,rootfs:,mapped-uid:,mapped-gid:,strip-components: -- "$@")SS
 
 if [ $? -ne 0 ]; then
     usage $(basename $0)
@@ -74,6 +76,7 @@ do
         --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
@@ -121,7 +124,7 @@ mkdir -p /var/lock/subsys
     fi
 
     mkdir -p ${LXC_ROOTFS}
-    (cd ${LXC_ROOTFS} && tar xfz ${LXC_TARBALL} --strip-components=2)
+    (cd ${LXC_ROOTFS} && tar xfz ${LXC_TARBALL} --strip-components=${LXC_STRIP_COMPONENTS})
     if [ $? -ne 0 ]; then
         echo "Failed to extract rootfs"
         exit 1

data/vagrant-lxc.gemspec

@@ -17,11 +17,4 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-09 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -92,10 +92,7 @@ homepage: https://github.com/fgrehm/vagrant-lxc
 licenses:
 - MIT
 metadata: {}
-post_install_message: "\n  Thanks for giving vagrant-lxc 1.0.0.alpha.3 a try!\n  This
-  version introduces many changes and includes some deprecations,\n  please see the
-  project's CHANGELOG:\n    https://github.com/fgrehm/vagrant-lxc/blob/master/CHANGELOG.md\n
-  \ "
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -106,9 +103,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2