Merge branch 'fixes' of https://github.com/attilabogar/vagrant-lxc into next

2014-02-02 19:49:24 -02:00 · 2014-02-02 19:49:24 -02:00 · 5db318d26f
commit 5db318d26f
parent 6e7ab85dad d8a8dbaa9b
1 changed files with 2 additions and 1 deletions
--- 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
@ -75,6 +75,7 @@ module Vagrant
        end

        def stop
+          attach '/sbin/halt'
          run :stop, '--name', @name
        end