rpm/vagrant
SHA256
1
0
Fork 0
forked from pool/vagrant
Code Pull Requests Activity
43150d3486
vagrant/0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch

31 lines
1.1 KiB
Diff
Raw Normal View History

Accepting request 649966 from home:ojkastl_buildservice:Branch_Virtualization_vagrant update to 2.2.0, needs additional rubygem vagrant_cloud, see sr#649907 OBS-URL: https://build.opensuse.org/request/show/649966 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=22
2018-11-17 21:34:14 +01:00
From f09ec3d92fd9638e8c7c72eaf522ec1afb42037b Mon Sep 17 00:00:00 2001
Accepting request 381084 from Virtualization OBS-URL: https://build.opensuse.org/request/show/381084 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=1
2016-04-12 19:31:48 +02:00
From: Antonio Terceiro <terceiro@softwarelivre.org>
Date: Tue, 3 Feb 2015 10:35:17 -0200
Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3
2017-08-31 21:03:29 +02:00
Subject: [PATCH] linux/cap/halt: don't wait for `shutdown -h now` to finish
Accepting request 381084 from Virtualization OBS-URL: https://build.opensuse.org/request/show/381084 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=1
2016-04-12 19:31:48 +02:00
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.
Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3
2017-08-31 21:03:29 +02:00
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
Accepting request 381084 from Virtualization OBS-URL: https://build.opensuse.org/request/show/381084 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=1
2016-04-12 19:31:48 +02:00
---
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
Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3
2017-08-31 21:03:29 +02:00
index 60dc5dde4..657636eaf 100644
Accepting request 381084 from Virtualization OBS-URL: https://build.opensuse.org/request/show/381084 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=1
2016-04-12 19:31:48 +02:00
--- 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 &")
Accepting request 477690 from Virtualization 1 OBS-URL: https://build.opensuse.org/request/show/477690 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=2
2017-03-12 20:03:16 +01:00
rescue IOError, Vagrant::Errors::SSHDisconnected
Accepting request 381084 from Virtualization OBS-URL: https://build.opensuse.org/request/show/381084 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=1
2016-04-12 19:31:48 +02:00
# Do nothing, because it probably means the machine shut down
# and SSH connection was lost.
Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3
2017-08-31 21:03:29 +02:00
--
Accepting request 649962 from home:ojkastl_buildservice:Branch_Virtualization_vagrant update to 2.1.3; removed patch 0007-Support-system-installed-plugins.patch; removed patch 0027-now-use-rubygem-net-ssh-5.0.x.patch OBS-URL: https://build.opensuse.org/request/show/649962 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=19
2018-11-17 21:30:13 +01:00
2.19.1
Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3
2017-08-31 21:03:29 +02:00
Copy Permalink