Allow backingstore options to be used along with the sudo wrapper script [GH-310]
This commit is contained in:
parent
fb23e606cc
commit
156bc015c8
3 changed files with 4 additions and 2 deletions
|
@ -24,9 +24,11 @@ IMPROVEMENTS:
|
||||||
|
|
||||||
BUG FIXES:
|
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]]
|
- Trim automatically generated container names to 64 chars [[GH-337]]
|
||||||
|
|
||||||
[GH-337]: https://github.com/fgrehm/vagrant-lxc/issues/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)
|
## [1.0.1](https://github.com/fgrehm/vagrant-lxc/compare/v1.0.0...v1.0.1) (Oct 15, 2014)
|
||||||
|
|
|
@ -64,9 +64,9 @@ module Vagrant
|
||||||
|
|
||||||
run :create,
|
run :create,
|
||||||
'-B', backingstore,
|
'-B', backingstore,
|
||||||
*(backingstore_options.to_a.flatten),
|
|
||||||
'--template', template,
|
'--template', template,
|
||||||
'--name', @name,
|
'--name', @name,
|
||||||
|
*(backingstore_options.to_a.flatten),
|
||||||
*(config_opts),
|
*(config_opts),
|
||||||
*extra
|
*extra
|
||||||
rescue Errors::ExecuteError => e
|
rescue Errors::ExecuteError => e
|
||||||
|
|
|
@ -99,9 +99,9 @@ describe Vagrant::LXC::Driver::CLI do
|
||||||
expect(subject).to have_received(:run).with(
|
expect(subject).to have_received(:run).with(
|
||||||
:create,
|
:create,
|
||||||
'-B', backingstore,
|
'-B', backingstore,
|
||||||
*(backingstore_opts.flatten),
|
|
||||||
'--template', template,
|
'--template', template,
|
||||||
'--name', name,
|
'--name', name,
|
||||||
|
*(backingstore_opts.flatten),
|
||||||
'-f', config_file,
|
'-f', config_file,
|
||||||
'--',
|
'--',
|
||||||
'--extra-param', 'param',
|
'--extra-param', 'param',
|
||||||
|
|
Loading…
Reference in a new issue