25 lines
971 B
Diff
25 lines
971 B
Diff
|
From: Antonio Terceiro <terceiro@softwarelivre.org>
|
||
|
|
Date: Tue, 3 Feb 2015 10:35:17 -0200
|
||
|
|
Subject: 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.
|
||
|
|
---
|
||
|
|
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 6125a20..8baa0d2 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
|
||
|
|
# Do nothing, because it probably means the machine shut down
|
||
|
|
# and SSH connection was lost.
|