Revision: 22886 http://trac.macosforge.org/projects/launchd/changeset/22886 Author: zarzycki@apple.com Date: 2006-09-27 10:56:00 -0700 (Wed, 27 Sep 2006) Log Message: -----------

From the manager of the Installer team in an e-mail today:

I would prefer /etc/rc.cdrom to /System/Installation since /System/Installation is part of the Install project and whenever we install roots on our system we will end up with a system that has /System/Installation. I would hate to have that trigger everything behaving differently. Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2006-09-27 15:14:53 UTC (rev 22885) +++ trunk/launchd/src/launchctl.c 2006-09-27 17:56:00 UTC (rev 22886) @@ -1182,7 +1182,7 @@ apply_sysctls_from_file("/etc/sysctl-macosxserver.conf"); apply_sysctls_from_file("/etc/sysctl.conf"); - if (path_check("/System/Installation") && path_check("/etc/rc.cdrom")) { + if (path_check("/etc/rc.cdrom")) { const char *rccdrom_tool[] = { _PATH_BSHELL, "/etc/rc.cdrom", "multiuser", NULL }; assumes(fwexec(rccdrom_tool, true) != -1); assumes(reboot(RB_HALT) != -1);