From 3b311ad8402570a7db3f1c4c89fa7db95fa307ae Mon Sep 17 00:00:00 2001 From: Eric Hartmann Date: Wed, 23 Apr 2014 17:49:04 +0200 Subject: [PATCH] Fix sudoers for multiple users --- lib/vagrant-lxc/command/sudoers.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/vagrant-lxc/command/sudoers.rb b/lib/vagrant-lxc/command/sudoers.rb index d99ab34..eb648c0 100644 --- a/lib/vagrant-lxc/command/sudoers.rb +++ b/lib/vagrant-lxc/command/sudoers.rb @@ -111,9 +111,6 @@ end base = "/var/lib/lxc" base_path = %r{\\A\#{base}/.*\\z} templates_path = %r{\\A/usr/(share|lib|lib64|local/lib)/lxc/templates/.*\\z} -boxes_path = %r{\\A#{Regexp.escape(@env.boxes_path.to_s)}/.*\\z} -gems_path = %r{\\A#{Regexp.escape(@env.gems_path.to_s)}/.*\\z} -template_src = %r{\\A#{Vagrant::LXC.source_root.join('scripts/lxc-template').to_s}\\z} ## # Commands from provider.rb @@ -130,9 +127,9 @@ Whitelist.add '/bin/mkdir', '-p', base_path Whitelist.add '/bin/cp', '-f', %r{/tmp/.*}, base_path Whitelist.add '/bin/chown', 'root:root', base_path # - Template import -Whitelist.add '/bin/cp', boxes_path, templates_path -Whitelist.add '/bin/cp', gems_path, templates_path -Whitelist.add '/bin/cp', template_src, templates_path +Whitelist.add '/bin/cp', %r{\\A.*\\z}, templates_path +Whitelist.add '/bin/cp', %r{\\A.*\\z}, templates_path +Whitelist.add '/bin/cp', %r{\\A.*\\z}, templates_path Whitelist.add '/bin/chmod', '+x', templates_path # - Template removal Whitelist.add '/bin/rm', templates_path