Revision
23709
Author
dsorresso@apple.com
Date
2008-08-29 17:01:50 -0700 (Fri, 29 Aug 2008)

Log Message

Fix for rdar://problem/5984126.

Modified Paths

Diff

Modified: trunk/launchd/src/launchctl.c (23708 => 23709)


--- trunk/launchd/src/launchctl.c	2008-08-29 23:23:53 UTC (rev 23708)
+++ trunk/launchd/src/launchctl.c	2008-08-30 00:01:50 UTC (rev 23709)
@@ -1415,11 +1415,6 @@
 	loopback_setup_ipv4();
 	loopback_setup_ipv6();
 
-	if (path_check("/etc/rc.server")) {
-		const char *rcserver_tool[] = { _PATH_BSHELL, "/etc/rc.server", NULL };
-		assumes(fwexec(rcserver_tool, NULL) != -1);
-	}
-
 	apply_sysctls_from_file("/etc/sysctl.conf");
 
 	if (path_check("/etc/rc.cdrom")) {
@@ -1437,6 +1432,11 @@
 		do_potential_fsck();
 	}
 
+	if (path_check("/etc/rc.server")) {
+		const char *rcserver_tool[] = { _PATH_BSHELL, "/etc/rc.server", NULL };
+		assumes(fwexec(rcserver_tool, NULL) != -1);
+	}
+
 	read_launchd_conf();
 
 	if (path_check("/var/account/acct")) {