Author: vines
Date: Tue Apr 23 18:00:18 2013
New Revision: 1471076
URL: http://svn.apache.org/r1471076
Log:
ACCUMULO-792 - slave-only isn't needed anymore and making them quieter
Removed:
accumulo/trunk/assemble/scripts/slave-only-init.sh
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/assemble/scripts/gc-only-init.sh
accumulo/trunk/assemble/scripts/master-only-init.sh
accumulo/trunk/assemble/scripts/monitor-only-init.sh
accumulo/trunk/assemble/scripts/tracer-only-init.sh
accumulo/trunk/assemble/scripts/tserver-only-init.sh
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1471075
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1471075
Modified: accumulo/trunk/assemble/scripts/gc-only-init.sh
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/scripts/gc-only-init.sh?rev=1471076&r1=1471075&r2=1471076&view=diff
==============================================================================
--- accumulo/trunk/assemble/scripts/gc-only-init.sh (original)
+++ accumulo/trunk/assemble/scripts/gc-only-init.sh Tue Apr 23 18:00:18 2013
@@ -38,10 +38,10 @@ fi
install -m 0755 -o root -g root init.d/accumulo-gc /etc/init.d/
-if [ -e "`which update-rc.d`" ]; then
+if which update-rc.d >>/dev/null 2>&1; then
update-rc.d accumulo-gc start 21 2 3 4 5 . stop 20 0 1 6 .
-elif [ -e "`which chkconfig`" ]; then
- chkconfig --add accumulo-gc
+elif which chkconfig >>/dev/null 2>&1; then
+ chkconfig --add accumulo-gc
else
echo "No update-rc.d or chkconfig, rc levels not set for accumulo-gc"
fi
Modified: accumulo/trunk/assemble/scripts/master-only-init.sh
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/scripts/master-only-init.sh?rev=1471076&r1=1471075&r2=1471076&view=diff
==============================================================================
--- accumulo/trunk/assemble/scripts/master-only-init.sh (original)
+++ accumulo/trunk/assemble/scripts/master-only-init.sh Tue Apr 23 18:00:18 2013
@@ -37,10 +37,10 @@ if ! id -u accumulo >/dev/null 2>&1; the
fi
install -m 0755 -o root -g root init.d/accumulo-master /etc/init.d/
-if [ -e "`which update-rc.d`" ]; then
+if which update-rc.d >>/dev/null 2>&1; then
update-rc.d accumulo-master start 21 2 3 4 5 . stop 19 0 1 6 .
-elif [ -e "`which chkconfig`" ]; then
- chkconfig --add accumulo-master
+elif which chkconfig >>/dev/null 2>&1; then
+ chkconfig --add accumulo-master
else
echo "No update-rc.d or chkconfig, rc levels not set for accumulo-master"
fi
Modified: accumulo/trunk/assemble/scripts/monitor-only-init.sh
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/scripts/monitor-only-init.sh?rev=1471076&r1=1471075&r2=1471076&view=diff
==============================================================================
--- accumulo/trunk/assemble/scripts/monitor-only-init.sh (original)
+++ accumulo/trunk/assemble/scripts/monitor-only-init.sh Tue Apr 23 18:00:18
2013
@@ -36,9 +36,9 @@ if ! id -u accumulo_monitor >/dev/null 2
fi
install -m 0755 -o root -g root init.d/accumulo-monitor /etc/init.d/
-if [ -e "`which update-rc.d`" ]; then
+if which update-rc.d >>/dev/null 2>&1; then
update-rc.d accumulo-monitor start 21 2 3 4 5 . stop 20 0 1 6 .
-elif [ -e "`which chkconfig`" ]; then
+elif which chkconfig >>/dev/null 2>&1; then
chkconfig --add accumulo-monitor
else
echo "No update-rc.d or chkconfig, rc levels not set for accumulo-monitor"
Modified: accumulo/trunk/assemble/scripts/tracer-only-init.sh
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/scripts/tracer-only-init.sh?rev=1471076&r1=1471075&r2=1471076&view=diff
==============================================================================
--- accumulo/trunk/assemble/scripts/tracer-only-init.sh (original)
+++ accumulo/trunk/assemble/scripts/tracer-only-init.sh Tue Apr 23 18:00:18 2013
@@ -36,9 +36,9 @@ if ! id -u accumulo_tracer >/dev/null 2>
fi
install -m 0755 -o root -g root init.d/accumulo-tracer /etc/init.d/
-if [ -e "`which update-rc.d`" ]; then
+if which update-rc.d >>/dev/null 2>&1; then
update-rc.d accumulo-tracer start 22 2 3 4 5 . stop 20 0 1 6 .
-elif [ -e "`which chkconfig`" ]; then
+elif which chkconfig >>/dev/null 2>&1; then
chkconfig --add accumulo-tracer
else
echo "No update-rc.d or chkconfig, rc levels not set for accumulo-tracer"
Modified: accumulo/trunk/assemble/scripts/tserver-only-init.sh
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/scripts/tserver-only-init.sh?rev=1471076&r1=1471075&r2=1471076&view=diff
==============================================================================
--- accumulo/trunk/assemble/scripts/tserver-only-init.sh (original)
+++ accumulo/trunk/assemble/scripts/tserver-only-init.sh Tue Apr 23 18:00:18
2013
@@ -37,9 +37,9 @@ if ! id -u accumulo >/dev/null 2>&1; the
fi
install -m 0755 -o root -g root init.d/accumulo-tserver /etc/init.d/
-if [ -e "`which update-rc.d`" ]; then
+if which update-rc.d >>/dev/null 2>&1; then
update-rc.d accumulo-tserver start 21 2 3 4 5 . stop 15 0 1 6 .
-elif [ -e "`which chkconfig`" ]; then
+elif which chkconfig >>/dev/null 2>&1; then
chkconfig --add accumulo-tserver
else
echo "No update-rc.d or chkconfig, rc levels not set for accumulo-tserver"
