b2269a63f2
Update to 2.2.5, rebase patches, fix test failures with of vagrant-libvirt, fix issues on ARM, fix dependency issues with addressable OBS-URL: https://build.opensuse.org/request/show/727276 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=34
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From 1ea744cf22640883f1b280aa98d02a163a328f2c Mon Sep 17 00:00:00 2001
|
|
From: Antonio Terceiro <terceiro@softwarelivre.org>
|
|
Date: Tue, 3 Feb 2015 10:35:17 -0200
|
|
Subject: [PATCH 03/15] linux/cap/halt: don't wait for `shutdown -h now` to
|
|
finish
|
|
|
|
When running a Debian 8 lxc guest (with the vagrant-lxc plugin), which
|
|
has systemd as init system, `vagrant halt` will hang waiting for
|
|
`shutdown -h now` to return.
|
|
|
|
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
|
|
---
|
|
plugins/guests/linux/cap/halt.rb | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/plugins/guests/linux/cap/halt.rb b/plugins/guests/linux/cap/halt.rb
|
|
index 60dc5dde4..657636eaf 100644
|
|
--- a/plugins/guests/linux/cap/halt.rb
|
|
+++ b/plugins/guests/linux/cap/halt.rb
|
|
@@ -4,7 +4,7 @@ module VagrantPlugins
|
|
class Halt
|
|
def self.halt(machine)
|
|
begin
|
|
- machine.communicate.sudo("shutdown -h now")
|
|
+ machine.communicate.sudo("shutdown -h now &")
|
|
rescue IOError, Vagrant::Errors::SSHDisconnected
|
|
# Do nothing, because it probably means the machine shut down
|
|
# and SSH connection was lost.
|
|
--
|
|
2.22.1
|
|
|