c999e7c3d4
Both of these commands failed to default the options disabling the provisioning from ignoring the sentinel file. This resulted in different behavior than what was seen with the `up` and `resume` commands which would only provision items with run set to "always". This defaults the options to proper match the behavior of `up` and `resume` to be consistent. This also adds an extra `--no-start` flag to allow users to restore a snapshot but not start the restored guest immediately. Fixes #6752
67 lines
1.8 KiB
Ruby
67 lines
1.8 KiB
Ruby
require 'optparse'
|
|
|
|
require 'vagrant'
|
|
|
|
require Vagrant.source_root.join("plugins/commands/up/start_mixins")
|
|
|
|
module VagrantPlugins
|
|
module CommandSnapshot
|
|
module Command
|
|
class Restore < Vagrant.plugin("2", :command)
|
|
|
|
include VagrantPlugins::CommandUp::StartMixins
|
|
|
|
def execute
|
|
options = {}
|
|
options[:provision_ignore_sentinel] = false
|
|
options[:snapshot_start] = true
|
|
|
|
opts = OptionParser.new do |o|
|
|
o.banner = "Usage: vagrant snapshot restore [options] [vm-name] <name>"
|
|
o.separator ""
|
|
build_start_options(o, options)
|
|
o.separator "Restore a snapshot taken previously with snapshot save."
|
|
|
|
o.on("--no-start", "Don't start the snapshot after the restore") do
|
|
options[:snapshot_start] = false
|
|
end
|
|
end
|
|
|
|
# Parse the options
|
|
argv = parse_options(opts)
|
|
return if !argv
|
|
if argv.empty? || argv.length > 2
|
|
raise Vagrant::Errors::CLIInvalidUsage,
|
|
help: opts.help.chomp
|
|
end
|
|
|
|
# Validate the provisioners
|
|
validate_provisioner_flags!(options, argv)
|
|
|
|
name = argv.pop
|
|
options[:snapshot_name] = name
|
|
|
|
with_target_vms(argv) do |vm|
|
|
if !vm.provider.capability?(:snapshot_list)
|
|
raise Vagrant::Errors::SnapshotNotSupported
|
|
end
|
|
|
|
snapshot_list = vm.provider.capability(:snapshot_list)
|
|
|
|
if snapshot_list.include? name
|
|
vm.action(:snapshot_restore, options)
|
|
else
|
|
raise Vagrant::Errors::SnapshotNotFound,
|
|
snapshot_name: name,
|
|
machine: vm.name.to_s
|
|
end
|
|
end
|
|
|
|
# Success, exit status 0
|
|
0
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|