upstart

Merge lp:~cjwatson/upstart/doc-valueless-env into lp:~canonical-scott/upstart/trunk

  1. doc-valueless-env
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Merged at revision: not available
Proposed branch: lp:~cjwatson/upstart/doc-valueless-env
Merge into: lp:~canonical-scott/upstart/trunk
Diff against target: 47 lines (+13/-3)
3 files modified
ChangeLog (+7/-0)
init/man/init.5 (+4/-1)
init/parse_job.c (+2/-2)
To merge this branch: bzr merge lp:~cjwatson/upstart/doc-valueless-env
Reviewer Review Type Date Requested Status
Scott James Remnant (Canonical) Pending
Review via email: mp+22552@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2010-03-02 00:03:37 +0000
3+++ ChangeLog 2010-03-31 17:32:27 +0000
4@@ -1,3 +1,10 @@
5+2010-03-31 Colin Watson <cjwatson@ubuntu.com>
6+
7+ * init/man/init.5 (env): Document behaviour when the environment
8+ variable's value is omitted.
9+ * init/parse_job.c (stanza_env): Document that arguments may be
10+ simply VAR as well as VAR=VALUE.
11+
12 2010-03-02 Michael Biebl <mbiebl@gmail.com>
13
14 * configure.ac: Remove double-quoting from NIH_CFLAGS and
15
16=== modified file 'init/man/init.5'
17--- init/man/init.5 2010-02-04 20:08:59 +0000
18+++ init/man/init.5 2010-03-31 17:32:27 +0000
19@@ -292,9 +292,12 @@
20 utility to default to acting on the job the commands are called from.
21
22 .TP
23-.B env \fIKEY\fR=\fIVALUE\fR
24+.B env \fIKEY\fR[=\fIVALUE\fR]
25 Defines a default environment variable, the value of which may be overriden
26 by the event or command that starts the job.
27+If no value is given, then the value is taken from the
28+.BR init (8)
29+daemon's own environment.
30 .\"
31 .TP
32 .B export \fIKEY\fR
33
34=== modified file 'init/parse_job.c'
35--- init/parse_job.c 2009-07-09 11:01:53 +0000
36+++ init/parse_job.c 2010-03-31 17:32:27 +0000
37@@ -1129,8 +1129,8 @@
38 * @lineno: line number.
39 *
40 * Parse an env stanza from @file, extracting a single argument of the form
41- * VAR=VALUE. These are stored in the env array, which is increased in
42- * size to accomodate the new value.
43+ * VAR or VAR=VALUE. These are stored in the env array, which is increased
44+ * in size to accomodate the new value.
45 *
46 * Returns: zero on success, negative value on error.
47 **/

Subscribers

People subscribed via source and target branches