SVN: rc-scripts/branches/upstart_native/rc.d/rc

[jajcus]

Author: jajcus
Date: Thu May  6 11:34:59 2010
New Revision: 11382

Modified:
   rc-scripts/branches/upstart_native/rc.d/rc
Log:
- do not use /etc/rc.d/init.d scripts when upstart job is in use instead

Modified: rc-scripts/branches/upstart_native/rc.d/rc
==============================================================================
--- rc-scripts/branches/upstart_native/rc.d/rc	(original)
+++ rc-scripts/branches/upstart_native/rc.d/rc	Thu May  6 11:34:59 2010
@@ -196,6 +196,9 @@
 		[ -f /var/lock/subsys/$subsys ] || \
 		[ -f /var/lock/subsys/${subsys}.init ] && continue
 
+		# Check if it is managed by upstart
+		use_upstart && -f /etc/init/${subsys}.conf && continue
+
 		# If we're in confirmation mode, get user confirmation
 		[ -n "$CONFIRM" ] &&
 		{