cf-diff

gistfile1.diff

diff --git a/controls/cf_serverd.cf b/controls/cf_serverd.cf
index 7a8c2201..e1490d42 100644
--- a/controls/cf_serverd.cf
+++ b/controls/cf_serverd.cf
@@ -50,7 +50,7 @@ body server control
       cfruncommand => "$(def.cf_runagent_shell) -c \"$(sys.cf_agent) -f $(sys.update_policy_path)\" ; $(sys.cf_agent)"; 
 
     !(windows|hpux|aix|solaris)::
-      cfruncommand => "$(def.cf_runagent_shell) -c \"$(sys.cf_agent) -f $(sys.update_policy_path)\" ; $(sys.cf_agent)";
+      cfruncommand => "@(def.cf_runagent_shell) -c \"$(sys.cf_agent) -f $(sys.update_policy_path)\" ; $(sys.cf_agent)";
 
 }
 
diff --git a/def.cf b/def.cf
index 2e978682..4c8e3334 100644
--- a/def.cf
+++ b/def.cf
@@ -108,7 +108,7 @@ bundle common def
 
       !(windows|solaris)::
       "cf_runagent_shell"
-        string  => "/bin/sh",
+        slist  => {"/bin/sh", "/usr/bin/bash"},
         comment => "Define path to shell used by cf-runagent",
         handle  => "common_def_vars_cf_runagent_shell";