diff options
| author | jtimberman <joshua@opscode.com> | 2010-12-15 22:08:53 -0800 |
|---|---|---|
| committer | Bryan McLellan <btm@opscode.com> | 2011-02-04 18:39:45 -0800 |
| commit | 19045b5521f50ef40307fe65409998faa362aca8 (patch) | |
| tree | 85098879f5c4e95716442374bb9db2173470759a /chef | |
| parent | 3d97dd7e1e97d087e8a7f878b1f0038ef0944474 (diff) | |
| download | chef-19045b5521f50ef40307fe65409998faa362aca8.tar.gz | |
CHEF-1938, add boot scripts for archlinux
Diffstat (limited to 'chef')
| -rw-r--r-- | chef/distro/arch/etc/rc.d/chef-server | 4 | ||||
| -rw-r--r-- | chef/distro/arch/etc/rc.d/chef-server-webui | 4 | ||||
| -rw-r--r-- | chef/distro/arch/etc/rc.d/chef-solr | 4 | ||||
| -rw-r--r-- | chef/distro/arch/etc/rc.d/chef-solr-indexer | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/chef/distro/arch/etc/rc.d/chef-server b/chef/distro/arch/etc/rc.d/chef-server index 59f926c2c9..27acfece7a 100644 --- a/chef/distro/arch/etc/rc.d/chef-server +++ b/chef/distro/arch/etc/rc.d/chef-server @@ -51,7 +51,11 @@ case "$1" in stop) stat_busy "Stopping $daemon_name daemon" +<<<<<<< HEAD PID=$(get_pid) +======= + PID=$(gid_pid) +>>>>>>> 26fafb3... CHEF-1938, add boot scripts for archlinux [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail diff --git a/chef/distro/arch/etc/rc.d/chef-server-webui b/chef/distro/arch/etc/rc.d/chef-server-webui index 79a9b77c1c..da8b4be7bc 100644 --- a/chef/distro/arch/etc/rc.d/chef-server-webui +++ b/chef/distro/arch/etc/rc.d/chef-server-webui @@ -51,7 +51,11 @@ case "$1" in stop) stat_busy "Stopping $daemon_name daemon" +<<<<<<< HEAD PID=$(get_pid) +======= + PID=$(gid_pid) +>>>>>>> 26fafb3... CHEF-1938, add boot scripts for archlinux [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail diff --git a/chef/distro/arch/etc/rc.d/chef-solr b/chef/distro/arch/etc/rc.d/chef-solr index a3682a495a..d704a43eb6 100644 --- a/chef/distro/arch/etc/rc.d/chef-solr +++ b/chef/distro/arch/etc/rc.d/chef-solr @@ -51,7 +51,11 @@ case "$1" in stop) stat_busy "Stopping $daemon_name daemon" +<<<<<<< HEAD PID=$(get_pid) +======= + PID=$(gid_pid) +>>>>>>> 26fafb3... CHEF-1938, add boot scripts for archlinux [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail diff --git a/chef/distro/arch/etc/rc.d/chef-solr-indexer b/chef/distro/arch/etc/rc.d/chef-solr-indexer index 3e89a59310..15110aed41 100644 --- a/chef/distro/arch/etc/rc.d/chef-solr-indexer +++ b/chef/distro/arch/etc/rc.d/chef-solr-indexer @@ -51,7 +51,11 @@ case "$1" in stop) stat_busy "Stopping $daemon_name daemon" +<<<<<<< HEAD PID=$(get_pid) +======= + PID=$(gid_pid) +>>>>>>> 26fafb3... CHEF-1938, add boot scripts for archlinux [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail |