diff options
| author | varac <varacanero@zeromail.org> | 2015-12-01 16:56:09 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-12-01 16:56:09 +0100 |
| commit | 1bc51c0e00917c4709830e54162829b10fe514fe (patch) | |
| tree | 68e4c4d4b90e729ae8cbfb2e2b94c5bb64cbf2b6 /lib | |
| parent | e3d278dda8105c02e9d22cd947631c9cbbe08d17 (diff) | |
| parent | 6cb59ea4149a94ec2ad037f97b00c9a1c4b75890 (diff) | |
Merge branch 'configure_vagrant_basebox' into develop
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/leap_cli/commands/vagrant.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/leap_cli/commands/vagrant.rb b/lib/leap_cli/commands/vagrant.rb index bf683cb6..a0de30c4 100644 --- a/lib/leap_cli/commands/vagrant.rb +++ b/lib/leap_cli/commands/vagrant.rb @@ -147,6 +147,8 @@ module LeapCli; module Commands netmask = IPAddr.new('255.255.255.255').mask(LeapCli.leapfile.vagrant_network.split('/').last).to_s basebox = options[:basebox] || 'LEAP/jessie' + # override basebox with custom setting from Leapfile or ~/.leaprc + basebox = leapfile.vagrant_basebox || basebox if vagrant_version <= Gem::Version.new('1.1.0') lines << %[Vagrant::Config.run do |config|] |