SVN: rc-scripts/trunk/rc.d/init.d/functions

[glen]

Author: glen
Date: Sat Aug 13 08:04:00 2011
New Revision: 12303

Modified:
   rc-scripts/trunk/rc.d/init.d/functions
Log:
allow $USE_UPSTART from env to preceed USE_UPSTART from sysconfig/system

Modified: rc-scripts/trunk/rc.d/init.d/functions
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/functions	(original)
+++ rc-scripts/trunk/rc.d/init.d/functions	Sat Aug 13 08:04:00 2011
@@ -54,11 +54,16 @@
 CHARS=""		# Characters displayed on the beginning of show line
 CCHARS="$NORMAL"	# Color of these characters (look at /etc/sysconfig/init-colors.gentoo example)
 
+# save from env, set by /sbin/service
+env_upstart=$USE_UPSTART
+
 # Source configuration if available - may override default values
 [ -r /etc/sysconfig/init-colors ] && . /etc/sysconfig/init-colors
 [ -r /etc/sysconfig/system ] && . /etc/sysconfig/system
 [ -r /etc/sysconfig/bootsplash ] && . /etc/sysconfig/bootsplash
 
+[ "$env_upstart" ] && USE_UPSTART=$env_upstart
+
 if [ -z "$VSERVER" -o "$VSERVER" = "detect" ]; then
 	{
 		while read _f _ctx; do