diff options
| author | Bill Nottingham <notting@redhat.com> | 2009-12-09 16:12:26 -0500 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2009-12-09 16:12:26 -0500 |
| commit | 12dcbfe79bbc89b23f775bfd847eb53ec17b2971 (patch) | |
| tree | de4e95b14ec6c0eb0b22450e70861e8c953cfeee /rc.d | |
| parent | 307e970174f12e4a808684151f132df1677c3999 (diff) | |
| parent | 5df584569b80bb8977f181e16b0de47fb4df08f1 (diff) | |
| download | initscripts-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')
| -rwxr-xr-x | rc.d/init.d/halt | 3 | ||||
| -rwxr-xr-x | rc.d/rc | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt index 5276246f..7144d3da 100755 --- a/rc.d/init.d/halt +++ b/rc.d/init.d/halt @@ -165,6 +165,9 @@ if [ -x /sbin/halt.local ]; then /sbin/halt.local fi +# Tell init to re-exec itself. +kill -TERM 1 + # Remount read only anything that's left mounted. # echo $"Remounting remaining filesystems readonly" mount | awk '{ print $3 }' | while read line; do @@ -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 |