Revision: 23575 http://trac.macosforge.org/projects/launchd/changeset/23575 Author: zarzycki@apple.com Date: 2008-03-27 14:40:32 -0700 (Thu, 27 Mar 2008) Log Message: ----------- <rdar://problem/5817359> 10.5.3 Regression: 9D8: After installing Final Cut Studio 2, machine fails to restart Modified Paths: -------------- branches/SULeopard/launchd/src/launchd_core_logic.c Modified: branches/SULeopard/launchd/src/launchd_core_logic.c =================================================================== --- branches/SULeopard/launchd/src/launchd_core_logic.c 2008-03-27 21:18:33 UTC (rev 23574) +++ branches/SULeopard/launchd/src/launchd_core_logic.c 2008-03-27 21:40:32 UTC (rev 23575) @@ -3916,7 +3916,7 @@ * We definitely need to revisit this after Leopard ships. Please see * launchctl.c for the other half of this hack. */ - if (j->mgr->global_on_demand_cnt > 0 && strcmp(j->label, "com.apple.kextd") != 0) { + if ((j->mgr->shutting_down || j->mgr->global_on_demand_cnt > 0) && strcmp(j->label, "com.apple.kextd") != 0) { return false; }