* Don't stop jobs that are already stopped.

svn path=/nixos/branches/upstart-0.6/; revision=18226
2009-11-06 21:17:11 +00:00 · 2009-11-06 21:17:11 +00:00 · 4b2ff53ec6
parent 82c3e2aa50
commit 4b2ff53ec6
1 changed files with 2 additions and 2 deletions
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@ -35,8 +35,8 @@ with pkgs.lib;


          # Stop all Upstart jobs.
-          initctl list | while read jobName rest; do
-              if test "$jobName" != shutdown; then
+          initctl list | while IFS=", " read jobName status rest; do
+              if test "$jobName" != shutdown -a "$status" != "stop/waiting"; then
                  echo "stopping $jobName..."
                  stop "$jobName"
              fi