aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d/rc
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2009-12-09 16:12:26 -0500
committerBill Nottingham <notting@redhat.com>2009-12-09 16:12:26 -0500
commit12dcbfe79bbc89b23f775bfd847eb53ec17b2971 (patch)
treede4e95b14ec6c0eb0b22450e70861e8c953cfeee /rc.d/rc
parent307e970174f12e4a808684151f132df1677c3999 (diff)
parent5df584569b80bb8977f181e16b0de47fb4df08f1 (diff)
downloadinitscripts-12dcbfe79bbc89b23f775bfd847eb53ec17b2971.tar
initscripts-12dcbfe79bbc89b23f775bfd847eb53ec17b2971.tar.gz
initscripts-12dcbfe79bbc89b23f775bfd847eb53ec17b2971.tar.bz2
initscripts-12dcbfe79bbc89b23f775bfd847eb53ec17b2971.tar.xz
initscripts-12dcbfe79bbc89b23f775bfd847eb53ec17b2971.zip
Merge branch 'upstart-0.6.0-branch'
Diffstat (limited to 'rc.d/rc')
-rwxr-xr-xrc.d/rc8
1 files changed, 4 insertions, 4 deletions
diff --git a/rc.d/rc b/rc.d/rc
index d918b7c7..73d266ab 100755
--- a/rc.d/rc
+++ b/rc.d/rc
@@ -65,9 +65,9 @@ for i in /etc/rc$runlevel.d/K* ; do
check_runlevel "$i" || continue
# Bring the subsystem down.
- [ -n "$UPSTART" ] && initctl emit --quiet stopping $subsys
+ [ -n "$UPSTART" ] && initctl emit --quiet stopping JOB=$subsys
$i stop
- [ -n "$UPSTART" ] && initctl emit --quiet stopped $subsys
+ [ -n "$UPSTART" ] && initctl emit --quiet stopped JOB=$subsys
done
# Now run the START scripts.
@@ -92,13 +92,13 @@ for i in /etc/rc$runlevel.d/S* ; do
update_boot_stage "$subsys"
# Bring the subsystem up.
- [ -n "$UPSTART" ] && initctl emit --quiet starting $subsys
+ [ -n "$UPSTART" ] && initctl emit --quiet starting JOB=$subsys
if [ "$subsys" = "halt" -o "$subsys" = "reboot" ]; then
export LC_ALL=C
exec $i start
fi
$i start
- [ -n "$UPSTART" ] && initctl emit --quiet started $subsys
+ [ -n "$UPSTART" ] && initctl emit --quiet started JOB=$subsys
done
[ "$do_confirm" = "yes" ] && rm -f /var/run/confirm
exit 0