guests/openbsd: include -h option on shutdown

For OpenBSD versions prior to 5.7 the `-h` option _must_ be provided
to the `shutdown` command when `-p` is used. Later versions no longer
require the `-h` option but still allow it for compatibility.

http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/sbin/shutdown/shutdown.8?rev=1.40&content-type=text/x-cvsweb-markup
http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/sbin/shutdown/shutdown.c?rev=1.40&content-type=text/x-cvsweb-markup
This commit is contained in:
Chris Roberts 2016-08-10 08:47:11 -07:00
parent 666d5e6391
commit 571659a5d1
3 changed files with 67 additions and 0 deletions

View File

@ -0,0 +1,19 @@
module VagrantPlugins
module GuestOpenBSD
module Cap
class Halt
def self.halt(machine)
begin
# Versions of OpenBSD prior to 5.7 require the -h option to be
# provided with the -p option. Later options allow the -h to
# be optional.
machine.communicate.sudo("/sbin/shutdown -p -h now", shell: "sh")
rescue IOError, Vagrant::Errors::SSHDisconnected
# Do nothing, because it probably means the machine shut down
# and SSH connection was lost.
end
end
end
end
end
end

View File

@ -21,6 +21,11 @@ module VagrantPlugins
Cap::ConfigureNetworks
end
guest_capability(:openbsd, :halt) do
require_relative "cap/halt"
Cap::Halt
end
guest_capability(:openbsd, :rsync_install) do
require_relative "cap/rsync"
Cap::RSync

View File

@ -0,0 +1,43 @@
require_relative "../../../../base"
describe "VagrantPlugins::GuestOpenBSD::Cap::Halt" do
let(:caps) do
VagrantPlugins::GuestOpenBSD::Plugin
.components
.guest_capabilities[:openbsd]
end
let(:machine) { double("machine") }
let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
before do
allow(machine).to receive(:communicate).and_return(comm)
end
after do
comm.verify_expectations!
end
describe ".halt" do
let(:cap) { caps.get(:halt) }
it "runs the shutdown command" do
comm.expect_command("/sbin/shutdown -p -h now")
cap.halt(machine)
end
it "ignores an IOError" do
comm.stub_command("/sbin/shutdown -p -h now", raise: IOError)
expect {
cap.halt(machine)
}.to_not raise_error
end
it "ignores an Vagrant::Errors::SSHDisconnected" do
comm.stub_command("/sbin/shutdown -p -h now", raise: Vagrant::Errors::SSHDisconnected)
expect {
cap.halt(machine)
}.to_not raise_error
end
end
end