------------------------------------------------------------ revno: 1416 committer: James Hunt <[email protected]> branch nick: upstart timestamp: Tue 2012-12-18 17:40:49 +0000 message: * init/man/init.5: - DESCRIPTION: More detail on User Session Mode. - SEE ALSO: Added ref to prctl(2). * init/man/init.8: - NOTES: Reworded. - ENVIRONMENT VARIABLES: New section. - FILES: Formatting. modified: init/man/init.5 init/man/init.8
-- lp:upstart https://code.launchpad.net/~upstart-devel/upstart/trunk Your team Upstart Reviewers is subscribed to branch lp:upstart. To unsubscribe from this branch go to https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'init/man/init.5' --- init/man/init.5 2012-12-18 13:58:23 +0000 +++ init/man/init.5 2012-12-18 17:40:49 +0000 @@ -1,4 +1,4 @@ -.TH init 5 2011-05-12 "Upstart" +.TH init 5 2012-12-18 "Upstart" .\" .SH NAME init \- Upstart init daemon job configuration @@ -131,16 +131,40 @@ .\" .SS User Session Mode -Upstart can manage complete User Session. In this mode upstart is -running as a user process. It will read configuration files from -.B $XDG_CONFIG_HOME/upstart/, -.B $XDG_CONFIG_DIRS/upstart/, -.B $HOME/.init/ and -.B /usr/share/upstart/sessions/. - -It will then launch the user's session. It will try to parent all -spawned process with aid from prctl. And kill everything upon logout -or shutdown. +Upstart can manage complete User Sessions. In this mode it runs with a +process id greater than 1 and will read job configuration files from the +following list of directories in the order shown: + +.IP \(bu 4 +.I $XDG_CONFIG_HOME/upstart/ +.IP \(bu 4 +.I $HOME/.init/ +.IP \(bu 4 +.I $XDG_CONFIG_DIRS/upstart/ +.IP \(bu 4 +.I /usr/share/upstart/sessions/ +.P + +Note that the first directory to contain a job is considered the owner +of that job name: any subsequently searched directory that contains a +job of the same name will be ignored. The same applies for override +files: only the first override file found in the search order will be +applied. Note that an override file does not have to be in the same +directory as the job it overrides, but if not in the directory of the +job it overrides, it must be in an +.I earlier +directory to that which contains the job. + +Jobs in these locations are expected to launch the user's session. +Upstart will try to parent all spawned process with the aid of +.BR prctl (2) "" . +If successful this will ensure that even double-forking daemons will be +reparented to the User Session process, and not to the +.BR init (8) +daemon running with process id 1. + +When running in User Session mode, Upstart will kill all job processes +on session logout or shutdown. .\" .SS Configuration File Format @@ -1025,5 +1049,6 @@ .SH SEE ALSO .BR init (8) .BR initctl (8) +.BR prctl (2) +.BR pty (7) .BR sh (1) -.BR pty (7) === modified file 'init/man/init.8' --- init/man/init.8 2012-12-18 13:58:23 +0000 +++ init/man/init.8 2012-12-18 17:40:49 +0000 @@ -139,19 +139,40 @@ id of 1. If this is not the case, it will actually execute .BR telinit (8) and pass all arguments to that. See that manual page for further -details. Unless \-\-user option is used, then it will read alternative -configuration files and manage the individual user session in a -similar fashion. +details. However, if the +.B \-\-user +option is specified, it will read alternative configuration files and +manage the individual user session in a similar fashion. +.\" +.SH ENVIRONMENT VARIABLES + +When run as a user process, the following variables may be used to find +job configuration files: + +.IP \(bu 4 +.I $XDG_CONFIG_HOME +.IP \(bu 4 +.I $XDG_CONFIG_DIRS +.P + +See +.B User Session Mode +in +.BR init (5) +for further details. + .\" .SH FILES .\" .I /etc/init.conf -.I /etc/init/*.conf +.I /etc/init/ .I $HOME/.init/ -.I $XDG_CONFIG_DIRS/upstart/, $XDG_CONFIG_HOME/upstart/ +.I $XDG_CONFIG_DIRS/upstart/ + +.I $XDG_CONFIG_HOME/upstart/ .\" .SH AUTHOR Written by Scott James Remnant
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
