Revision: 23903 http://trac.macosforge.org/projects/launchd/changeset/23903 Author: dsorresso@apple.com Date: 2009-04-22 12:59:41 -0700 (Wed, 22 Apr 2009) Log Message: ----------- More documentation updates. Modified Paths: -------------- trunk/launchd/src/launchctl.1 trunk/launchd/src/launchd.8 trunk/launchd/src/launchd.conf.5 trunk/launchd/src/launchd.plist.5 trunk/launchd/src/rc.8 Modified: trunk/launchd/src/launchctl.1 =================================================================== --- trunk/launchd/src/launchctl.1 2009-04-20 22:46:16 UTC (rev 23902) +++ trunk/launchd/src/launchctl.1 2009-04-22 19:59:41 UTC (rev 23903) @@ -1,4 +1,4 @@ -.Dd September 30, 2004 +.Dd 1 May, 2009 .Dt launchctl 1 .Os Darwin .Sh NAME Modified: trunk/launchd/src/launchd.8 =================================================================== --- trunk/launchd/src/launchd.8 2009-04-20 22:46:16 UTC (rev 23902) +++ trunk/launchd/src/launchd.8 2009-04-22 19:59:41 UTC (rev 23903) @@ -1,4 +1,4 @@ -.Dd September 30, 2004 +.Dd 1 May, 2009 .Dt launchd 8 .Os Darwin .Sh NAME @@ -22,33 +22,13 @@ Where possible, it is preferable for jobs to launch on demand based on criteria specified in their respective configuration files. .Pp -When run with a command, a specific instance of -.Nm -is created and the command is implicitly added to the list of jobs maintained by -.Nm . -If the command exits, that instance of -.Nm -will clean up all jobs maintained by itself and exit. All children of the command will use that -instance of -.Nm . -.Pp During boot .Nm is invoked by the kernel to run as the first process on the system and to further bootstrap the rest of the system. -.Sh OPTIONS -.Bl -tag -width -indent -.It Fl D -Debug. Prints syslog messages to stderr and adjusts logging via -.Xr syslog 3 -to LOG_DEBUG. -.El -.Sh OPTIONS WHEN RUN AS PID 1 -.Bl -tag -width -indent -.It Fl s -Single user mode. Instructs -.Nm launchd -to give a shell prompt before booting the system. -.El +.Pp +You cannot invoke +.Nm +directly. .Sh ENVIRONMENTAL VARIABLES .Bl -tag -width -indent .It Pa LAUNCHD_SOCKET @@ -59,7 +39,7 @@ .Nm launchd as opposed to more traditional mechanisms or mechanisms provided in earlier versions of Mac OS X. These alternate methods should be considered deprecated and not suitable for new projects. - +.Pp Also, in the .Nm launchd lexicon, a "daemon" is, by definition, a system-wide service of which there is one instance for all clients. An "agent" is a service that runs on @@ -84,5 +64,3 @@ .Sh SEE ALSO .Xr launchctl 1 , .Xr launchd.plist 5 , -.Xr rc 8 , -.Xr SystemStarter 8 Modified: trunk/launchd/src/launchd.conf.5 =================================================================== --- trunk/launchd/src/launchd.conf.5 2009-04-20 22:46:16 UTC (rev 23902) +++ trunk/launchd/src/launchd.conf.5 2009-04-22 19:59:41 UTC (rev 23903) @@ -1,4 +1,4 @@ -.Dd January 10, 2005 +.Dd 1 May, 2009 .Dt launchd.conf 5 .Os Darwin .Sh NAME @@ -9,15 +9,18 @@ .Nm /etc/launchd.conf .Sh DESCRIPTION .Nm -contains a list of subcommands to run via -.Nm launchctl +contains a list of subcommands +.Ar ( load , +.Ar unload , +etc.) to run via +.Xr launchctl 1 when -.Nm launchd +.Xr launchd 8 starts. .Sh FILES .Bl -tag -width "$HOME/.launchd.conf" -compact .It Pa $HOME/.launchd.conf -Your launchd configuration file. +Your launchd configuration file (currently unsupported). .It Pa /etc/launchd.conf The system's launchd configuration file. .El Modified: trunk/launchd/src/launchd.plist.5 =================================================================== --- trunk/launchd/src/launchd.plist.5 2009-04-20 22:46:16 UTC (rev 23902) +++ trunk/launchd/src/launchd.plist.5 2009-04-22 19:59:41 UTC (rev 23903) @@ -1,4 +1,4 @@ -.Dd September 30, 2004 +.Dd 1 May, 2009 .Dt launchd.plist 5 .Os Darwin .Sh NAME @@ -171,7 +171,7 @@ is free to send the SIGKILL signal. .It Sy OnDemand <boolean> This key was used in Mac OS X 10.4 to control whether a job was kept alive or not. The default was true. -This key has been deprecated and replaced in Mac OS X 10.5 with the more powerful KeepAlive option. +This key has been deprecated and replaced in Mac OS X 10.5 and later with the more powerful KeepAlive option. .It Sy KeepAlive <boolean or dictionary of stuff> This optional key is used to control whether your job is to be kept continuously running or to let demand and conditions control the invocation. The @@ -485,15 +485,14 @@ .It Pa /Library/LaunchAgents Per-user agents provided by the administrator. .It Pa /Library/LaunchDaemons -System wide daemons provided by the administrator. +System-wide daemons provided by the administrator. .It Pa /System/Library/LaunchAgents -Mac OS X Per-user agents. +Per-user agents provided by Mac OS X. .It Pa /System/Library/LaunchDaemons -Mac OS X System wide daemons. +System-wide daemons provided by Mac OS X. .El .Sh SEE ALSO .Xr launchctl 1 , -.Xr launch 3 , .Xr sysctl 3 , .Xr launchd 8 , .Xr plist 5 Modified: trunk/launchd/src/rc.8 =================================================================== --- trunk/launchd/src/rc.8 2009-04-20 22:46:16 UTC (rev 23902) +++ trunk/launchd/src/rc.8 2009-04-22 19:59:41 UTC (rev 23903) @@ -1,4 +1,4 @@ -.Dd May 31, 2006 +.Dd 1 May, 2009 .Dt RC 8 .Os Darwin .Sh NAME @@ -8,22 +8,15 @@ .Nm rc .Nm rc.local .Sh DESCRIPTION -Prior to Mac OS X 10.5, the -.Nm rc -script -was used to bootstrap the OS. As of Leopard, the system is self-bootstrapped via -.Xr launchd 8 -which uses the -.Xr launchctl 1 -bootstrap subcommand to read in launchd jobs from the standard locations. -For compatibility reasons, the .Nm rc.local -script still continues to work. -.Pp -The startup file -.Nm rc.local -reside in -.Pa /etc . +is now unsupported and has been replaced with +.Xr launchd 8 , +which bootstraps itself via the +.Xr launchctl 1 +.Ar bootstrap +subcommand to read in +.Xr launchd 8 +jobs from the standard locations. .Sh SEE ALSO .Xr launchd 8 , .Xr launchctl 1