Changeset 23530

Timestamp:

2008-03-04 09:53:17 (7 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5770964> More flexible is_apple_internal() check [10A14 vs. 10A12: 3-4 sec boot time regression (launchd)]

Location:

trunk/launchd/src

Files:

• launchctl.c (modified) (1 diff)
• launchd_runtime.c (modified) (1 diff)

trunk/launchd/src/launchctl.c

@@ -3191 +3191 @@
         struct stat sb;
 
-        if (stat("/AppleInternal", &sb) == 0) {
+        if (stat("/AppleInternal", &sb) == 0 && stat("/var/db/disableAppleInternal", &sb) == -1) {
                 do_apple_internal_magic = true;
         }

trunk/launchd/src/launchd_runtime.c

@@ -1648 +1648 @@
         }
 
-        if (stat("/AppleInternal", &sb) != -1) {
+        if (stat("/AppleInternal", &sb) == 0 && stat("/var/db/disableAppleInternal", &sb) == -1) {
                 do_apple_internal_logging = true;
         }