From c99a1fb2aec3f71f7bd432c90beb6193b2ca0cbf Mon Sep 17 00:00:00 2001 From: Shawn Neal Date: Thu, 1 May 2014 09:03:49 -0700 Subject: [PATCH] Display deprecation warning for unused halt config properties halt_timeout and halt_check_interval will be removed in the next version of Vagrant, 1.7. --- plugins/guests/smartos/config.rb | 13 +++++++++++-- plugins/guests/solaris/config.rb | 13 +++++++++++-- plugins/guests/solaris11/config.rb | 13 +++++++++++-- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/plugins/guests/smartos/config.rb b/plugins/guests/smartos/config.rb index 65e9f8ea2..201141ed5 100644 --- a/plugins/guests/smartos/config.rb +++ b/plugins/guests/smartos/config.rb @@ -8,11 +8,20 @@ module VagrantPlugins attr_accessor :device def initialize - @halt_timeout = 30 - @halt_check_interval = 1 + @halt_timeout = UNSET_VALUE + @halt_check_interval = UNSET_VALUE @suexec_cmd = 'pfexec' @device = "e1000g" end + + def finalize! + if @halt_timeout != UNSET_VALUE + puts "smartos.halt_timeout is deprecated and will be removed in Vagrant 1.7" + end + if @halt_check_interval != UNSET_VALUE + puts "smartos.halt_check_interval is deprecated and will be removed in Vagrant 1.7" + end + end end end end diff --git a/plugins/guests/solaris/config.rb b/plugins/guests/solaris/config.rb index e36b9c127..e0a6a486b 100644 --- a/plugins/guests/solaris/config.rb +++ b/plugins/guests/solaris/config.rb @@ -8,11 +8,20 @@ module VagrantPlugins attr_accessor :device def initialize - @halt_timeout = 30 - @halt_check_interval = 1 + @halt_timeout = UNSET_VALUE + @halt_check_interval = UNSET_VALUE @suexec_cmd = 'sudo' @device = "e1000g" end + + def finalize! + if @halt_timeout != UNSET_VALUE + puts "solaris.halt_timeout is deprecated and will be removed in Vagrant 1.7" + end + if @halt_check_interval != UNSET_VALUE + puts "solaris.halt_check_interval is deprecated and will be removed in Vagrant 1.7" + end + end end end end diff --git a/plugins/guests/solaris11/config.rb b/plugins/guests/solaris11/config.rb index 9a177ceb5..935e0d9b9 100644 --- a/plugins/guests/solaris11/config.rb +++ b/plugins/guests/solaris11/config.rb @@ -12,11 +12,20 @@ module VagrantPlugins attr_accessor :device def initialize - @halt_timeout = 30 - @halt_check_interval = 1 + @halt_timeout = UNSET_VALUE + @halt_check_interval = UNSET_VALUE @suexec_cmd = 'sudo' @device = "net" end + + def finalize! + if @halt_timeout != UNSET_VALUE + puts "solaris11.halt_timeout is deprecated and will be removed in Vagrant 1.7" + end + if @halt_check_interval != UNSET_VALUE + puts "solaris11.halt_check_interval is deprecated and will be removed in Vagrant 1.7" + end + end end end end