allow $USE_UPSTART from env to preceed USE_UPSTART from sysconfig/system

svn-id: @12303

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 75cd7f2a30bacf4b433a4bdf243793ce4fced82b..332fc0463e5e16a7827efc8c66cb56342ac852e8 100644 (file)
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -54,11 +54,16 @@ CRESMAN="$GREEN"    # "Resource Manager" color
 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