Revision: 23875 http://trac.macosforge.org/projects/launchd/changeset/23875 Author: dsorresso@apple.com Date: 2009-03-30 16:02:31 -0700 (Mon, 30 Mar 2009) Log Message: ----------- <rdar://problem/6731700> launchd is writing out to /var/log and shouldn't Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c trunk/launchd/src/launchd_runtime.h Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2009-03-28 21:14:03 UTC (rev 23874) +++ trunk/launchd/src/launchd_runtime.c 2009-03-30 23:02:31 UTC (rev 23875) @@ -134,6 +134,11 @@ bool g_simulate_pid1_crash = false; bool g_use_gmalloc = false; bool g_log_per_user_shutdown = false; +#if !TARGET_OS_EMBEDDED +bool g_log_pid1_shutdown = true; +#else +bool g_log_pid1_shutdown = false; +#endif bool g_log_strict_usage = false; pid_t g_wsp = 0; @@ -1456,10 +1461,9 @@ launchd_log_vm_stats(); } - pthread_mutex_lock(&ourlock); - if (unlikely(ourlogfile == NULL)) { + if( unlikely(ourlogfile == NULL) && g_log_pid1_shutdown ) { rename("/var/log/launchd-shutdown.log", "/var/log/launchd-shutdown.log.1"); ourlogfile = fopen("/var/log/launchd-shutdown.log", "a"); } @@ -1819,6 +1823,10 @@ g_use_gmalloc = true; } + if( pid1_magic && stat("/var/db/.launchd_log_pid1_shutdown", &sb) ) { + g_log_pid1_shutdown = true; + } + if( stat("/var/db/.launchd_log_strict_usage", &sb) == 0 ) { g_log_strict_usage = true; } Modified: trunk/launchd/src/launchd_runtime.h =================================================================== --- trunk/launchd/src/launchd_runtime.h 2009-03-28 21:14:03 UTC (rev 23874) +++ trunk/launchd/src/launchd_runtime.h 2009-03-30 23:02:31 UTC (rev 23875) @@ -107,6 +107,7 @@ extern bool g_use_gmalloc; extern bool g_log_per_user_shutdown; extern bool g_log_strict_usage; +extern bool g_embedded_shutdown_log; extern pid_t g_wsp; mach_port_t runtime_get_kernel_port(void);