diff options
author | Tomas Mraz <tmraz@fedoraproject.org> | 2016-02-17 14:57:15 +0100 |
---|---|---|
committer | Tomas Mraz <tmraz@fedoraproject.org> | 2016-02-17 14:57:15 +0100 |
commit | 51e2581a6cbedefebbb7bbe3fd8f3374049bc7c5 (patch) | |
tree | 6ceb7246f1afc43b815b7ad3c8d4ac379888e25d /modules/pam_env/pam_env.conf.5.xml | |
parent | 8bb171506fc2579669fd86bd29885f256e26ccb0 (diff) | |
download | pam-51e2581a6cbedefebbb7bbe3fd8f3374049bc7c5.tar.gz pam-51e2581a6cbedefebbb7bbe3fd8f3374049bc7c5.tar.bz2 pam-51e2581a6cbedefebbb7bbe3fd8f3374049bc7c5.zip |
pam_env: Document the /etc/environment file.
* modules/pam_env/Makefile.am: Add the environment.5 soelim stub.
* modules/pam_env/pam_env.8.xml: Add environ(7) reference.
* modules/pam_env/pam_env.conf.5.xml: Add environment alias name.
Add a paragraph about /etc/environment. Add environ(7) reference.
Diffstat (limited to 'modules/pam_env/pam_env.conf.5.xml')
-rw-r--r-- | modules/pam_env/pam_env.conf.5.xml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/modules/pam_env/pam_env.conf.5.xml b/modules/pam_env/pam_env.conf.5.xml index 4040275a..c47f17d9 100644 --- a/modules/pam_env/pam_env.conf.5.xml +++ b/modules/pam_env/pam_env.conf.5.xml @@ -12,7 +12,8 @@ <refnamediv> <refname>pam_env.conf</refname> - <refpurpose>the environment variables config file</refpurpose> + <refname>environment</refname> + <refpurpose>the environment variables config files</refpurpose> </refnamediv> @@ -60,6 +61,14 @@ at front) can be used to mark this line as a comment line. </para> + <para> + The <filename>/etc/environment</filename> file specifies + the environment variables to be set. The file must consist of simple + <emphasis>NAME=VALUE</emphasis> pairs on separate lines. + The <citerefentry><refentrytitle>pam_env</refentrytitle><manvolnum>8</manvolnum></citerefentry> + module will read the file after the <filename>pam_env.conf</filename> + file. + </para> </refsect1> <refsect1 id="pam_env.conf-examples"> @@ -113,7 +122,8 @@ <para> <citerefentry><refentrytitle>pam_env</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>, - <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum></citerefentry> + <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum></citerefentry>, + <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry> </para> </refsect1> |