1.patch

--- chef-client.init    2009-11-04 09:44:30.000000000 -0800
+++ ../SOURCES/chef-client.init 2009-12-17 15:06:37.000000000 -0800
@@ -17,8 +17,8 @@
 pidfile=${PIDFILE-/var/run/chef/client.pid}
 lockfile=${LOCKFILE-/var/lock/subsys/$prog}
 config=${CONFIG-/etc/chef/client.rb}
-user=${USER-root}
-group=${GROUP-root}
+chef_user=${CHEF_USER-root}
+chef_group=${CHEF_GROUP-root}
 interval=${INTERVAL-1800}
 splay=${SPLAY-20}
 logfile=${LOGFILE-/var/log/chef/client.log}

2.patch

--- chef-server.init    2009-11-04 09:44:39.000000000 -0800
+++ ../SOURCES/chef-server.init 2009-12-17 15:07:35.000000000 -0800
@@ -18,15 +18,15 @@
 pidfile=${PIDFILE-/var/run/chef/server.main.pid}
 lockfile=${LOCKFILE-/var/lock/subsys/$prog}
 config=${CONFIG-/etc/chef/server.rb}
-user=${USER-chef}
-group=${GROUP-chef}
+chef_user=${CHEF_USER-chef}
+chef_group=${CHEF_GROUP-chef}
 cluster_nodes=${CLUSTER_NODES-2}
 logfile=${LOGFILE-/var/log/chef/merb.%s.log}
 options=${OPTIONS-}

 start() {
     echo -n "Starting $prog:"
-    daemon chef-server -d -c "$cluster_nodes" -C "$config" -u "$user" -G "$group" -L "$logfile" -P "$childpidfiles" "$options" "&>/dev/null"
+    daemon chef-server -d -c "$cluster_nodes" -C "$config" -u "$chef_user" -G "$chef_group" -L "$logfile" -P "$childpidfiles" "$options" "&>/dev/null"
     RETVAL=$?
     echo
     [ $RETVAL -eq 0 ] && touch ${lockfile

3.patch

--- chef-client.sysconf 2009-11-02 22:52:04.000000000 -0800
+++ ../SOURCES/chef-client.sysconf      2009-12-17 15:06:36.000000000 -0800
@@ -2,8 +2,8 @@

 #PIDFILE=/var/run/chef/client.pid
 #CONFIG=/etc/chef/client.rb
-#USER=root
-#GROUP=root
+#CHEF_USER=root
+#CHEF_GROUP=root
 #INTERVAL=1800
 #SPLAY=20
 #LOGFILE=/var/log/chef/client.log

4.patch

--- chef-server.sysconf 2009-11-03 10:33:05.000000000 -0800
+++ ../SOURCES/chef-server.sysconf      2009-12-17 15:07:14.000000000 -0800
@@ -3,8 +3,8 @@
 #CHILDPIDFILES=/var/run/chef/server.%s.pid
 #PIDFILE=/var/run/chef/server.pid
 #CONFIG=/etc/chef/server.rb
-#USER=chef
-#GROUP=chef
+#CHEF_USER=chef
+#CHEF_GROUP=chef
 #CLUSTER_NODES=2
 #LOGFILE=/var/log/chef/merb.%s.log
 #OPTIONS=