Changeset 23154

Timestamp:

03/19/07 11:26:21 (21 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5071550> launchd needs exec on disk mount option

Location:

trunk/launchd/src

Files:

• launchd.plist.5 (modified) (1 diff)
• launchd_core_logic.c (modified) (8 diffs)
• launchd_runtime.c (modified) (2 diffs)
• liblaunch_public.h (modified) (1 diff)

trunk/launchd/src/launchd.plist.5

@@ -196 +196 @@
 .It Sy QueueDirectories <array of strings>
 Much like the WatchPaths option, this key will watch the paths for modifications. The difference being that the job will only be started if the path is a directory and the directory is not empty.
+.It Sy StartOnMount <boolean>
+This optional key causes the job to be started every time a filesystem is mounted.
 .It Sy StartInterval <integer>
 This optional key causes the job to be started every N seconds.

trunk/launchd/src/launchd_core_logic.c

@@ -223 +223 @@
 static void jobmgr_log_stray_children(jobmgr_t jm);
 static void jobmgr_remove(jobmgr_t jm);
-static void jobmgr_dispatch_all(jobmgr_t jm);
+static void jobmgr_dispatch_all(jobmgr_t jm, bool newmounthack);
 static job_t job_mig_intran2(jobmgr_t jm, mach_port_t p);
 static void job_export_all2(jobmgr_t jm, launch_data_t where);
@@ -279 +279 @@
         unsigned int globargv:1, wait4debugger:1, unload_at_exit:1, stall_before_exec:1, only_once:1,
                      currently_ignored:1, forced_peers_to_demand_mode:1, setnice:1, hopefully_exits_last:1, removal_pending:1,
-                     wait4pipe_eof:1, sent_sigkill:1, debug_before_kill:1, weird_bootstrap:1;
+                     wait4pipe_eof:1, sent_sigkill:1, debug_before_kill:1, weird_bootstrap:1, start_on_mount:1;
         char label[0];
 };
@@ -767 +767 @@
 
         if (j->mgr->global_on_demand_cnt == 0) {
-                jobmgr_dispatch_all(j->mgr);
+                jobmgr_dispatch_all(j->mgr, false);
         }
 
@@ -1090 +1090 @@
                 if (strcasecmp(key, LAUNCH_JOBKEY_SESSIONCREATE) == 0) {
                         j->session_create = value;
+                } else if (strcasecmp(key, LAUNCH_JOBKEY_STARTONMOUNT) == 0) {
+                        j->start_on_mount = value;
                 }
                 break;
@@ -1752 +1754 @@
 
 void
-jobmgr_dispatch_all(jobmgr_t jm)
+jobmgr_dispatch_all(jobmgr_t jm, bool newmounthack)
 {
         jobmgr_t jmi, jmn;
@@ -1758 +1760 @@
 
         SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) {
-                jobmgr_dispatch_all(jmi);
+                jobmgr_dispatch_all(jmi, newmounthack);
         }
 
         SLIST_FOREACH_SAFE(ji, &jm->jobs, sle, jn) {
-                job_dispatch(ji, false);
+                job_dispatch(ji, newmounthack ? ji->start_on_mount : false);
         }
 }
@@ -1909 +1911 @@
                         return (void)jobmgr_assumes(jm, false);
                 }
+                break;
+        case EVFILT_FS:
+                if (kev->fflags & VQ_MOUNT) {
+                        jobmgr_dispatch_all(jm, true);
+                }
+                jobmgr_dispatch_all_semaphores(jm);
                 break;
         case EVFILT_TIMER:
@@ -3504 +3512 @@
         if (!jm) {
                 jobmgr_assumes(jmr, kevent_mod(SIGTERM, EVFILT_SIGNAL, EV_ADD, 0, 0, jmr) != -1);
+                jobmgr_assumes(jmr, kevent_mod(0, EVFILT_FS, EV_ADD|EV_CLEAR, VQ_MOUNT|VQ_UNMOUNT|VQ_UPDATE, 0, jmr) != -1);
         }
 

trunk/launchd/src/launchd_runtime.c

@@ -43 +43 @@
 #include <sys/mount.h>
 #include <sys/reboot.h>
+#include <sys/fcntl.h>
 #include <bsm/libbsm.h>
 #include <malloc/malloc.h>
@@ -889 +890 @@
                 record_caller_creds(&bufRequest->Head);
 
+                /*
+                 * This is a total hack. We really need a bit in the kernel's proc
+                 * struct to declare our intent.
+                 */
+                static int no_hang_fd = -1;
+                if (no_hang_fd == -1) {
+                        no_hang_fd = _fd(open("/dev/autofs_nowait", 0));
+                }
+
                 if (the_demux(&bufRequest->Head, &bufReply->Head) == FALSE) {
                         /* XXX - also gross */

trunk/launchd/src/liblaunch_public.h

@@ -82 +82 @@
 #define LAUNCH_JOBKEY_LOWPRIORITYIO             "LowPriorityIO"
 #define LAUNCH_JOBKEY_SESSIONCREATE             "SessionCreate"
+#define LAUNCH_JOBKEY_STARTONMOUNT              "StartOnMount"
 #define LAUNCH_JOBKEY_SOFTRESOURCELIMITS        "SoftResourceLimits"
 #define LAUNCH_JOBKEY_HARDRESOURCELIMITS        "HardResourceLimits"