Changeset 23029

Timestamp:

02/05/07 14:11:16 (22 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/4976905> turn SystemStarter into a launchd job

Location:

trunk/launchd/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• SystemStarter.c (modified) (2 diffs)
• launchctl.c (modified) (1 diff)

trunk/launchd/src/Makefile.am

@@ -94 +94 @@
         mkdir -p $(DESTDIR)/Library/LaunchDaemons
         mkdir -p $(DESTDIR)/Library/LaunchAgents
+        mkdir -p $(DESTDIR)/System/Library/LaunchAgents
         mkdir -p $(DESTDIR)/System/Library/LaunchDaemons
-        mkdir -p $(DESTDIR)/System/Library/LaunchAgents
+        cp $(srcdir)/com.apple.SystemStarter.plist $(DESTDIR)/System/Library/LaunchDaemons
 
 endif

trunk/launchd/src/Makefile.in

@@ -1108 +1108 @@
 @LIBS_ONLY_FALSE@       mkdir -p $(DESTDIR)/Library/LaunchDaemons
 @LIBS_ONLY_FALSE@       mkdir -p $(DESTDIR)/Library/LaunchAgents
+@LIBS_ONLY_FALSE@       mkdir -p $(DESTDIR)/System/Library/LaunchAgents
 @LIBS_ONLY_FALSE@       mkdir -p $(DESTDIR)/System/Library/LaunchDaemons
-@LIBS_ONLY_FALSE@       mkdir -p $(DESTDIR)/System/Library/LaunchAgents
+@LIBS_ONLY_FALSE@       cp $(srcdir)/com.apple.SystemStarter.plist $(DESTDIR)/System/Library/LaunchDaemons
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

trunk/launchd/src/SystemStarter.c

@@ -23 +23 @@
  **/
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <paths.h>
 #include <unistd.h>
 #include <crt_externs.h>
@@ -148 +151 @@
         }
 
-        exit(system_starter(anAction, aService));
+        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);
 }
 

trunk/launchd/src/launchctl.c

@@ -1275 +1275 @@
         _vproc_set_global_on_demand(false);
 
-        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);
-        }
-
         return 0;
 }