Author: tmckay
Date: 2011-05-25 14:35:50 +0000 (Wed, 25 May 2011)
New Revision: 4786
Modified:
trunk/cumin/etc/sysvinit-cumin
Log:
More informative error messages from init.d script when attempting to start
or stop cumin as a non-root user. Added [FAILED] banner when environment checks
fail in general.
BZ704653
Modified: trunk/cumin/etc/sysvinit-cumin
===================================================================
--- trunk/cumin/etc/sysvinit-cumin 2011-05-25 13:22:58 UTC (rev 4785)
+++ trunk/cumin/etc/sysvinit-cumin 2011-05-25 14:35:50 UTC (rev 4786)
@@ -32,8 +32,16 @@
start() {
+ echo -n $"Starting cumin: "
+ if [[ "$EUID" != "0" ]]; then
+ echo_failure; echo
+ echo "Must be run as root"
+ exit 1
+ fi
+
# Initial checks for the start case
cumin-database check-started &> /dev/null || {
+ echo_failure; echo
echo "Cumin's database server is not running"
echo "Run 'cumin-database start' as root"
exit 1
@@ -41,6 +49,7 @@
cumin-database check &> /dev/null || {
# Run again with output left on for user.
+ echo_failure; echo
echo "Cumin's database is not yet installed"
echo "Run 'cumin-database install' as root"
@@ -49,7 +58,6 @@
exit 1
}
- echo -n $"Starting cumin: "
# If it's already running, be happy and return success
status $processname &> /dev/null
[ $? -eq 0 ] && echo_success && echo && return
@@ -78,6 +86,10 @@
if [ $RETVAL -eq 0 ]; then
rm -f /var/lock/subsys/$servicename
rm -f /var/run/cumin.pid
+ else
+ if [[ "$EUID" != "0" ]]; then
+ echo "Must be run as root"
+ fi
fi
}
Show replies by date