From 156bc015c8511d04279a3f1f899f725412269628 Mon Sep 17 00:00:00 2001 From: Fabio Rehm Date: Wed, 14 Jan 2015 21:07:35 -0200 Subject: [PATCH] Allow backingstore options to be used along with the sudo wrapper script [GH-310] --- CHANGELOG.md | 2 ++ lib/vagrant-lxc/driver/cli.rb | 2 +- spec/unit/driver/cli_spec.rb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b317c14..454b649 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,9 +24,11 @@ IMPROVEMENTS: BUG FIXES: + - Allow backingstore options to be used along with the sudo wrapper script [[GH-310]] - Trim automatically generated container names to 64 chars [[GH-337]] [GH-337]: https://github.com/fgrehm/vagrant-lxc/issues/337 +[GH-310]: https://github.com/fgrehm/vagrant-lxc/issues/310 ## [1.0.1](https://github.com/fgrehm/vagrant-lxc/compare/v1.0.0...v1.0.1) (Oct 15, 2014) diff --git a/lib/vagrant-lxc/driver/cli.rb b/lib/vagrant-lxc/driver/cli.rb index d5093a5..ea47afe 100644 --- a/lib/vagrant-lxc/driver/cli.rb +++ b/lib/vagrant-lxc/driver/cli.rb @@ -64,9 +64,9 @@ module Vagrant run :create, '-B', backingstore, - *(backingstore_options.to_a.flatten), '--template', template, '--name', @name, + *(backingstore_options.to_a.flatten), *(config_opts), *extra rescue Errors::ExecuteError => e diff --git a/spec/unit/driver/cli_spec.rb b/spec/unit/driver/cli_spec.rb index 06bdf41..e52533b 100644 --- a/spec/unit/driver/cli_spec.rb +++ b/spec/unit/driver/cli_spec.rb @@ -99,9 +99,9 @@ describe Vagrant::LXC::Driver::CLI do expect(subject).to have_received(:run).with( :create, '-B', backingstore, - *(backingstore_opts.flatten), '--template', template, '--name', name, + *(backingstore_opts.flatten), '-f', config_file, '--', '--extra-param', 'param',