From e4e4551aea1f4fb5d53e4c2554dbb6a870a7318a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Bog=C3=A1r?= Date: Tue, 19 Nov 2013 22:23:25 +0000 Subject: [PATCH 1/2] fix incompatibility issue with ppa:ubuntu-lxc/stable and ppa:ubuntu-lxc/daily --- lib/vagrant-lxc/driver/cli.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vagrant-lxc/driver/cli.rb b/lib/vagrant-lxc/driver/cli.rb index 80e538f..dde4864 100644 --- a/lib/vagrant-lxc/driver/cli.rb +++ b/lib/vagrant-lxc/driver/cli.rb @@ -38,7 +38,7 @@ module Vagrant end def state - if @name && run(:info, '--name', @name, retryable: true) =~ /^state:[^A-Z]+([A-Z]+)$/ + if @name && run(:info, '--name', @name, retryable: true) =~ /^[Ss]tate: *[^A-Z]+([A-Z]+)$/ $1.downcase.to_sym elsif @name :unknown From d8a8dbaa9bd755749ec80f0a60c8306b7144c673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Bog=C3=A1r?= Date: Tue, 19 Nov 2013 22:24:36 +0000 Subject: [PATCH 2/2] fix long waiting time with centos 6.4 containers on ubuntu 13.10 host --- lib/vagrant-lxc/driver/cli.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/vagrant-lxc/driver/cli.rb b/lib/vagrant-lxc/driver/cli.rb index dde4864..7f08c4e 100644 --- a/lib/vagrant-lxc/driver/cli.rb +++ b/lib/vagrant-lxc/driver/cli.rb @@ -69,6 +69,7 @@ module Vagrant end def stop + attach '/sbin/halt' run :stop, '--name', @name end