Merge pull request #193 from jsuchome/Code-11-SP3

- better check for running chef-client (bnc#868483)
yast · Mar 25, 2014 · e4aa0a9 · e4aa0a9
2 parents 40e10b1 + 1811581
commit e4aa0a9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.17.134
+2.17.135
diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 25 08:11:08 CET 2014 - jsuchome@suse.cz
+
+- better check for running chef-client (bnc#868483)
+- 2.17.135
+
 -------------------------------------------------------------------
 Wed Feb  5 12:50:37 CET 2014 - jsuchome@suse.cz
 

diff --git a/scripts/yast2 b/scripts/yast2
@@ -211,7 +211,7 @@ snapshot_post()
 
 chef_is_running ()
 {
-  pgrep -fl chef-client >/dev/null
+  service chef-client status >/dev/null 2>&1
 }
 
 # ask user if he want to continue despite there is chef-client running