[DRE-commits] [vagrant-lxc] 03/04: Refresh patches

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository vagrant-lxc.

commit 65266645b6aac52e4087149e78fc72c5a02dedc6
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Thu Oct 22 10:15:53 2015 -0200

    Refresh patches
---
 debian/changelog                                          |  1 +
 debian/patches/0001-Read-extra-files-from-usr-share.patch | 12 ++++++------
 debian/patches/0002-Fix-shebang-in-sudoers-template.patch |  6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d276a7b..712ba1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 vagrant-lxc (1.2.1-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Refresh patches
 
  -- Antonio Terceiro <terceiro at debian.org>  Thu, 22 Oct 2015 10:08:10 -0200
 
diff --git a/debian/patches/0001-Read-extra-files-from-usr-share.patch b/debian/patches/0001-Read-extra-files-from-usr-share.patch
index 3d6bbbc..5ad50f0 100644
--- a/debian/patches/0001-Read-extra-files-from-usr-share.patch
+++ b/debian/patches/0001-Read-extra-files-from-usr-share.patch
@@ -43,7 +43,7 @@ index 6d78800..d76ab44 100644
          end
  
 diff --git a/lib/vagrant-lxc/command/sudoers.rb b/lib/vagrant-lxc/command/sudoers.rb
-index fcb2099..4505c90 100644
+index 42b538a..cf74643 100644
 --- a/lib/vagrant-lxc/command/sudoers.rb
 +++ b/lib/vagrant-lxc/command/sudoers.rb
 @@ -46,7 +46,7 @@ module Vagrant
@@ -56,18 +56,18 @@ index fcb2099..4505c90 100644
                :pipework_regex => "#{ENV['HOME']}/\.vagrant\.d/gems/gems/vagrant-lxc.+/scripts/pipework"
              )
 diff --git a/lib/vagrant-lxc/driver.rb b/lib/vagrant-lxc/driver.rb
-index 0544057..618b71a 100644
+index e2304bf..e050a18 100644
 --- a/lib/vagrant-lxc/driver.rb
 +++ b/lib/vagrant-lxc/driver.rb
-@@ -143,7 +143,7 @@ module Vagrant
-       def configure_private_network(bridge_name, bridge_ip, container_name, ip)
-         @logger.info "Configuring network interface for #{container_name} using #{ip} and bridge #{bridge_name}"
+@@ -164,7 +164,7 @@ module Vagrant
+         end
+ 
          cmd = [
 -          Vagrant::LXC.source_root.join('scripts/pipework').to_s,
 +          Vagrant::LXC.scripts_path.join('pipework').to_s,
            bridge_name,
            container_name,
-           "#{ip}/24"
+           ip ||= "dhcp"
 diff --git a/lib/vagrant-lxc/plugin.rb b/lib/vagrant-lxc/plugin.rb
 index bf8f4dd..9f4d947 100644
 --- a/lib/vagrant-lxc/plugin.rb
diff --git a/debian/patches/0002-Fix-shebang-in-sudoers-template.patch b/debian/patches/0002-Fix-shebang-in-sudoers-template.patch
index fd82bc2..23b7231 100644
--- a/debian/patches/0002-Fix-shebang-in-sudoers-template.patch
+++ b/debian/patches/0002-Fix-shebang-in-sudoers-template.patch
@@ -7,12 +7,12 @@ Subject: Fix shebang in sudoers template
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/templates/sudoers.rb.erb b/templates/sudoers.rb.erb
-index 94db7f7..f4c1e07 100644
+index cfcb68a..b4e78f5 100644
 --- a/templates/sudoers.rb.erb
 +++ b/templates/sudoers.rb.erb
 @@ -1,4 +1,4 @@
--#!/opt/vagrant/embedded/bin/ruby
-+#!/usr/bin/ruby
+-#!<%= cmd_paths['ruby'] %>
++#/usr/bin/ruby
  # Automatically created by vagrant-lxc
  
  class Whitelist

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/vagrant-lxc.git