From: Elan Ruusamäe Date: Wed, 19 Aug 2015 14:09:46 +0000 (+0300) Subject: use chef-client as test, not knife X-Git-Tag: auto/th/vagrant-1.7.4-1~4 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fvagrant.git;a=commitdiff_plain;h=3353e2a3bdd04afe0bde2a80870d466a3044391b use chef-client as test, not knife --- diff --git a/pld-chef-installed.patch b/pld-chef-installed.patch index 5a9635e..96f1667 100644 --- a/pld-chef-installed.patch +++ b/pld-chef-installed.patch @@ -19,18 +19,18 @@ + module Chef + module Cap + module PLD -+ module ChefInstalled ++ module ChefInstalled + # Check if Chef is installed at the given version. + # @return [true, false] + def self.chef_installed(machine, version) -+ knife = "/usr/bin/knife" ++ knife = "/usr/bin/chef-client" + command = "test -x #{knife}" -+ ++ + if version != :latest + command << "&& #{knife} --version | grep 'Chef: #{version}'" + end + -+ machine.communicate.test(command, sudo: true) ++ machine.communicate.test(command, sudo: true) + end + end + end