<!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>[23041] trunk/launchd/src/launchd.c</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23041">23041</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-02-07 17:28:03 -0800 (Wed, 07 Feb 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>With this change, you can now: "sudo kill -TERM 1" and the machine will gracefully power off.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchdc">trunk/launchd/src/launchd.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchdc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd.c (23040 => 23041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd.c 2007-02-07 23:39:58 UTC (rev 23040)
+++ trunk/launchd/src/launchd.c 2007-02-08 01:28:03 UTC (rev 23041)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #include <sys/ioctl.h>
</span><span class="cx"> #include <sys/mount.h>
</span><span class="cx"> #include <sys/kern_event.h>
</span><ins>+#include <sys/reboot.h>
</ins><span class="cx"> #include <net/if.h>
</span><span class="cx"> #include <netinet/in.h>
</span><span class="cx"> #include <netinet/in_var.h>
</span><span class="lines">@@ -678,12 +679,14 @@
</span><span class="cx"> if (shutdown_in_progress && jobmgr_is_idle(root_jobmgr)) {
</span><span class="cx"> shutdown_in_progress = false;
</span><span class="cx">
</span><del>- if (getpid() != 1) {
</del><ins>+ if (getpid() == 1) {
+ if (re_exec_in_single_user_mode) {
+ kill(-1, SIGKILL); /* One last time, just to clear the room */
+ launchd_assumes(execl("/sbin/launchd", "/sbin/launchd", "-s", NULL) != -1);
+ }
+ launchd_assumes(reboot(RB_HALT) != -1);
+ } else {
</ins><span class="cx"> exit(EXIT_SUCCESS);
</span><del>- } else if (re_exec_in_single_user_mode) {
- re_exec_in_single_user_mode = false;
- kill(-1, SIGKILL); /* One last time, just to clear the room */
- launchd_assumes(execl("/sbin/launchd", "/sbin/launchd", "-s", NULL) != -1);
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (getpid() == 1) {
</span></span></pre>
</div>
</div>
</body>
</html>