From 6cb59ea4149a94ec2ad037f97b00c9a1c4b75890 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 1 Dec 2015 10:27:31 +0100 Subject: [feat] Make vagrant basebox configurable reads @vagrant_basebox from Leapfile or ~/.leaprc, needs commit baaa21ca2 in leap_cli. - Resolves: #7657 --- lib/leap_cli/commands/vagrant.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/leap_cli') 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|] -- cgit v1.2.3