<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23029] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23029">23029</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-02-05 14:11:16 -0800 (Mon, 05 Feb 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/4976905> turn SystemStarter into a launchd job</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrcMakefileam">trunk/launchd/src/Makefile.am</a></li>
<li><a href="#trunklaunchdsrcMakefilein">trunk/launchd/src/Makefile.in</a></li>
<li><a href="#trunklaunchdsrcSystemStarterc">trunk/launchd/src/SystemStarter.c</a></li>
<li><a href="#trunklaunchdsrclaunchctlc">trunk/launchd/src/launchctl.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrcMakefileam"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/Makefile.am (23028 => 23029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/Makefile.am 2007-02-05 21:35:42 UTC (rev 23028)
+++ trunk/launchd/src/Makefile.am 2007-02-05 22:11:16 UTC (rev 23029)
</span><span class="lines">@@ -93,7 +93,8 @@
</span><span class="cx"> mkdir -p $(DESTDIR)/$(sysconfdir)/mach_init_per_user.d
</span><span class="cx"> mkdir -p $(DESTDIR)/Library/LaunchDaemons
</span><span class="cx"> mkdir -p $(DESTDIR)/Library/LaunchAgents
</span><ins>+ mkdir -p $(DESTDIR)/System/Library/LaunchAgents
</ins><span class="cx"> mkdir -p $(DESTDIR)/System/Library/LaunchDaemons
</span><del>- mkdir -p $(DESTDIR)/System/Library/LaunchAgents
</del><ins>+ cp $(srcdir)/com.apple.SystemStarter.plist $(DESTDIR)/System/Library/LaunchDaemons
</ins><span class="cx">
</span><span class="cx"> endif
</span></span></pre></div>
<a id="trunklaunchdsrcMakefilein"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/Makefile.in (23028 => 23029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/Makefile.in 2007-02-05 21:35:42 UTC (rev 23028)
+++ trunk/launchd/src/Makefile.in 2007-02-05 22:11:16 UTC (rev 23029)
</span><span class="lines">@@ -1107,8 +1107,9 @@
</span><span class="cx"> @LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/$(sysconfdir)/mach_init_per_user.d
</span><span class="cx"> @LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/Library/LaunchDaemons
</span><span class="cx"> @LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/Library/LaunchAgents
</span><ins>+@LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/System/Library/LaunchAgents
</ins><span class="cx"> @LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/System/Library/LaunchDaemons
</span><del>-@LIBS_ONLY_FALSE@ mkdir -p $(DESTDIR)/System/Library/LaunchAgents
</del><ins>+@LIBS_ONLY_FALSE@ cp $(srcdir)/com.apple.SystemStarter.plist $(DESTDIR)/System/Library/LaunchDaemons
</ins><span class="cx"> # Tell versions [3.59,3.63) of GNU make to not export all variables.
</span><span class="cx"> # Otherwise a system limit (for SysV at least) may be exceeded.
</span><span class="cx"> .NOEXPORT:
</span></span></pre></div>
<a id="trunklaunchdsrcSystemStarterc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/SystemStarter.c (23028 => 23029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/SystemStarter.c 2007-02-05 21:35:42 UTC (rev 23028)
+++ trunk/launchd/src/SystemStarter.c 2007-02-05 22:11:16 UTC (rev 23029)
</span><span class="lines">@@ -22,6 +22,9 @@
</span><span class="cx"> * @APPLE_APACHE_LICENSE_HEADER_END@
</span><span class="cx"> **/
</span><span class="cx">
</span><ins>+#include <sys/types.h>
+#include <sys/stat.h>
+#include <paths.h>
</ins><span class="cx"> #include <unistd.h>
</span><span class="cx"> #include <crt_externs.h>
</span><span class="cx"> #include <fcntl.h>
</span><span class="lines">@@ -147,7 +150,27 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- exit(system_starter(anAction, aService));
</del><ins>+ int ssec = system_starter(anAction, aService);
+ struct stat sb;
+
+ if (anAction == kActionStart && stat("/etc/rc.local", &sb) != -1) {
+ int wstatus;
+ pid_t rclp;
+
+ switch ((rclp = fork())) {
+ case -1:
+ break;
+ case 0:
+ execlp(_PATH_BSHELL, _PATH_BSHELL, "/etc/rc.local", NULL);
+ _exit(EXIT_FAILURE);
+ break;
+ default:
+ waitpid(rclp, &wstatus, 0);
+ break;
+ }
+ }
+
+ exit(ssec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunklaunchdsrclaunchctlc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchctl.c (23028 => 23029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchctl.c 2007-02-05 21:35:42 UTC (rev 23028)
+++ trunk/launchd/src/launchctl.c 2007-02-05 22:11:16 UTC (rev 23029)
</span><span class="lines">@@ -1274,14 +1274,6 @@
</span><span class="cx">
</span><span class="cx"> _vproc_set_global_on_demand(false);
</span><span class="cx">
</span><del>- const char *SystemStarter_tool[] = { "SystemStarter", NULL };
- assumes(fwexec(SystemStarter_tool, false) != -1);
-
- if (path_check("/etc/rc.local")) {
- const char *rc_local_tool[] = { _PATH_BSHELL, "/etc/rc.local", NULL };
- assumes(fwexec(rc_local_tool, true) != -1);
- }
-
</del><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>