Changeset 23039

Timestamp:

02/07/07 13:07:49 (22 months ago)

Author:

zarzycki@…

Message:

Clean up. Now if we can properly make our reflector threads go away, we should be able to go to single user mode again. :-)

Files:

• trunk/launchd/src/launchd.c (modified) (4 diffs)

trunk/launchd/src/launchd.c

@@ -301 +301 @@
          */
         if (!h && stat(ldconf, &sb) == 0) {
-                job_dispatch(rlcj, true);
+                rlcj = job_dispatch(rlcj, true);
         }
 
         if (fbj) {
-                job_dispatch(fbj, true);
+                fbj = job_dispatch(fbj, true);
         }
 
@@ -475 +475 @@
 launchd_single_user(void)
 {
-        int tries;
+        syslog(LOG_NOTICE, "Going to single-user mode");
+
+        re_exec_in_single_user_mode = true;
 
         launchd_shutdown();
 
-        kill(-1, SIGTERM);
-
-        for (tries = 0; tries < 10; tries++) {
-                sleep(1);
-                if (kill(-1, 0) == -1 && errno == ESRCH) {
-                        goto out;
-                }
-        }
-
-        syslog(LOG_WARNING, "Gave up waiting for processes to exit while going to single user mode, sending SIGKILL");
+        sleep(3);
+
         kill(-1, SIGKILL);
-
-out:
-        re_exec_in_single_user_mode = true;
 }
 
@@ -502 +493 @@
         case SIGHUP:
                 if (rlcj) {
-                        job_dispatch(rlcj, true);
+                        rlcj = job_dispatch(rlcj, true);
                 }
                 break;
@@ -692 +683 @@
                 } 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);
                 }