Fix sudo wrapper mechanism for fedora

2 files changed, 95 insertions, 6 deletions

diff --git a/vagrant-lxc-sudo-wrapper.patch b/vagrant-lxc-sudo-wrapper.patch
new file mode 100644
index 0000000..925832a
--- /dev/null
+++ b/vagrant-lxc-sudo-wrapper.patch
@@ -0,0 +1,77 @@
+From 43f3351bb2d2c2e80c68bc5c0368c8b5c7f2f9ce Mon Sep 17 00:00:00 2001
+From: Michael Adam <obnox@samba.org>
+Date: Mon, 26 Jan 2015 16:35:34 +0100
+Subject: [PATCH] Make vagrant-lxc-wrapper sudo mechanism useful for system
+ installed vagrant (on fedora)
+
+- different path for wrapper
+- uses vagrant group instead of per-user sudo
+- prefixes PATH with /usr/bin
+- use system path for piperwork script
+...
+---
+ lib/vagrant-lxc.rb                 | 3 ++-
+ lib/vagrant-lxc/command/sudoers.rb | 6 ++++--
+ templates/sudoers.rb.erb           | 4 ++--
+ 3 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/lib/vagrant-lxc.rb b/lib/vagrant-lxc.rb
+index 825eb18..1128549 100644
+--- a/lib/vagrant-lxc.rb
++++ b/lib/vagrant-lxc.rb
+@@ -8,7 +8,8 @@ module Vagrant
+     end
+ 
+     def self.sudo_wrapper_path
+-      "/usr/local/bin/vagrant-lxc-wrapper"
++      #"/usr/local/bin/vagrant-lxc-wrapper"
++      "/usr/share/vagrant/gems/gems/vagrant-lxc-1.1.0/scripts/vagrant-lxc-wrapper"
+     end
+   end
+ end
+diff --git a/lib/vagrant-lxc/command/sudoers.rb b/lib/vagrant-lxc/command/sudoers.rb
+index fcb2099..d75861b 100644
+--- a/lib/vagrant-lxc/command/sudoers.rb
++++ b/lib/vagrant-lxc/command/sudoers.rb
+@@ -48,7 +48,8 @@ module Vagrant
+               '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"
++              #:pipework_regex => "#{ENV['HOME']}/\.vagrant\.d/gems/gems/vagrant-lxc.+/scripts/pipework"
++              :pipework_regex => "/usr/share/vagrant/gems/gems/vagrant-lxc.+/scripts/pipework"
+             )
+             file.puts template.render
+           end
+@@ -59,7 +60,8 @@ module Vagrant
+         def create_sudoers!(user, command)
+           sudoers = Tempfile.new('vagrant-lxc-sudoers').tap do |file|
+             file.puts "# Automatically created by vagrant-lxc"
+-            file.puts "#{user} ALL=(root) NOPASSWD: #{command}"
++            #file.puts "#{user} ALL=(root) NOPASSWD: #{command}"
++            file.puts "%vagrant ALL=(root) NOPASSWD: #{command}"
+           end
+           sudoers.close
+           sudoers.path
+diff --git a/templates/sudoers.rb.erb b/templates/sudoers.rb.erb
+index 94db7f7..d7977bc 100644
+--- a/templates/sudoers.rb.erb
++++ b/templates/sudoers.rb.erb
+@@ -1,4 +1,4 @@
+-#!/opt/vagrant/embedded/bin/ruby
++#!/usr/bin/env ruby
+ # Automatically created by vagrant-lxc
+ 
+ class Whitelist
+@@ -31,7 +31,7 @@ class Whitelist
+ 
+     def run!(argv)
+       begin
+-        command, args = `which #{argv.shift}`.chomp, argv || []
++        command, args = `PATH=/usr/bin:$PATH which #{argv.shift}`.chomp, argv || []
+         check!(command, args)
+         system "#{command} #{args.join(" ")}"
+ 
+-- 
+2.1.0
+
diff --git a/vagrant-lxc.spec b/vagrant-lxc.spec
index 1dd6995..ad66a47 100644
--- a/vagrant-lxc.spec
+++ b/vagrant-lxc.spec
@@ -2,14 +2,16 @@
 
 Name: %{vagrant_plugin_name}
 Version: 1.1.0
-Release: 2%{?dist}
-Summary: lxc provider for vagrant
+Release: 3%{?dist}
+Summary: LXC provider for vagrant
 Group: Development/Languages
 License: MIT
 URL: https://github.com/fgrehm/vagrant-lxc
 Source0: https://rubygems.org/gems/%{vagrant_plugin_name}-%{version}.gem
 
-#Requires(pre): shadow-utils
+Patch1: vagrant-lxc-sudo-wrapper.patch
+
+Requires(pre): shadow-utils
 Requires(posttrans): vagrant
 Requires(preun): vagrant
 Requires: ruby(release)
@@ -28,7 +30,7 @@ BuildRequires: rubygem(rspec) < 3
 BuildArch: noarch
 
 %description
-lxc provider for vagrant.
+LXC provider for vagrant.
 
 %package doc
 Summary: Documentation for %{name}
@@ -44,6 +46,8 @@ gem unpack %{SOURCE0}
 
 %setup -q -D -T -n  %{vagrant_plugin_name}-%{version}
 
+%patch1 -p1
+
 gem spec %{SOURCE0} -l --ruby > %{vagrant_plugin_name}.gemspec
 
 
@@ -56,6 +60,8 @@ mkdir -p %{buildroot}%{vagrant_plugin_dir}
 cp -a .%{vagrant_plugin_dir}/* \
         %{buildroot}%{vagrant_plugin_dir}/
 
+PATH=/usr/bin:$PATH vagrant lxc sudoers
+
 # polkit rule for vagrant group.
 #mkdir -p %{buildroot}%{_datadir}/polkit-1/rules.d
 #install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/polkit-1/rules.d/
@@ -70,8 +76,8 @@ cp -a .%{vagrant_plugin_dir}/* \
 #bundle exec rspec2 spec
 #popd
 
-#%pre
-#getent group vagrant >/dev/null || groupadd -r vagrant
+%pre
+getent group vagrant >/dev/null || groupadd -r vagrant
 
 %posttrans
 %vagrant_plugin_register %{vagrant_plugin_name}
@@ -88,6 +94,7 @@ cp -a .%{vagrant_plugin_dir}/* \
 %exclude %{vagrant_plugin_cache}
 %exclude %{vagrant_plugin_instdir}/.gitignore
 %{vagrant_plugin_spec}
+%{_sysconfdir}/sudoers.d/vagrant-lxc
 
 %exclude %{vagrant_plugin_instdir}/.rspec
 %exclude %{vagrant_plugin_instdir}/.travis.yml
@@ -95,6 +102,7 @@ cp -a .%{vagrant_plugin_dir}/* \
 %{vagrant_plugin_instdir}/Gemfile.lock
 %{vagrant_plugin_instdir}/scripts/lxc-template
 %{vagrant_plugin_instdir}/scripts/pipework
+%{vagrant_plugin_instdir}/scripts/vagrant-lxc-wrapper
 %{vagrant_plugin_instdir}/templates/sudoers.rb.erb
 
 
@@ -112,6 +120,10 @@ cp -a .%{vagrant_plugin_dir}/* \
 %{vagrant_plugin_instdir}/vagrant-spec.config.rb
 
 %changelog
+* Mon Jan 26 2015 Michael Adam <madam@redhat.com> - 1.1.0-3
+- Capitalize summary and description.
+- Fix sudo wrapper and "vagrant lxc sudoers" mechansim from upstream.
+
 * Mon Jan 26 2015 Michael Adam <madam@redhat.com> - 1.1.0-2
 - Move some files from -doc to main package.