diff options
author | Allison Karlitskaya <allison.karlitskaya@redhat.com> | 2018-05-16 14:44:41 +0200 |
---|---|---|
committer | Tomáš Mráz <t8m@users.noreply.github.com> | 2018-05-16 14:44:41 +0200 |
commit | 9532d85871990d41ccd3d851fff10386a4925270 (patch) | |
tree | e91d7a8b1e8ab371393bb19fb308521030ff83de /modules/pam_motd/pam_motd.8.xml | |
parent | 042a387924acb3f7dd36ec48f123127500ceca8f (diff) | |
download | pam-9532d85871990d41ccd3d851fff10386a4925270.tar.gz pam-9532d85871990d41ccd3d851fff10386a4925270.tar.bz2 pam-9532d85871990d41ccd3d851fff10386a4925270.zip |
pam_motd: add support for a motd.d directory (#48)
Add a new feature to pam_motd to allow packages to install their own
message files in a "motd.d" directory, to be displayed after the primary
motd.
Add an option motd_d= to specify the location of this directory.
Modify the defaults, in the case where no options are given, to display
both /etc/motd and /etc/motd.d.
Fixes #47
* modules/pam_motd/pam_motd.c: add support for motd.d
* modules/pam_motd/pam_motd.8.xml: update the manpage
Diffstat (limited to 'modules/pam_motd/pam_motd.8.xml')
-rw-r--r-- | modules/pam_motd/pam_motd.8.xml | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/modules/pam_motd/pam_motd.8.xml b/modules/pam_motd/pam_motd.8.xml index ff92154e..906c4ed0 100644 --- a/modules/pam_motd/pam_motd.8.xml +++ b/modules/pam_motd/pam_motd.8.xml @@ -52,7 +52,24 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term> + <option>motd_dir=<replaceable>/path/dirname.d</replaceable></option> + </term> + <listitem> + <para> + The <filename>/path/dirname.d</filename> directory is scanned + and each file contained inside of it is displayed. + </para> + </listitem> + </varlistentry> </variablelist> + <para> + When no options are given, the default is to display both + <filename>/etc/motd</filename> and the contents of + <filename>/etc/motd.d</filename>. Specifying either option (or both) + will disable this default behavior. + </para> </refsect1> <refsect1 id="pam_motd-types"> @@ -81,7 +98,20 @@ <para> The suggested usage for <filename>/etc/pam.d/login</filename> is: <programlisting> -session optional pam_motd.so motd=/etc/motd +session optional pam_motd.so + </programlisting> + </para> + <para> + To use a <filename>motd</filename> file from a different location: + <programlisting> +session optional pam_motd.so motd=/elsewhere/motd + </programlisting> + </para> + <para> + To use a <filename>motd</filename> file from elsewhere, along with a + corresponding <filename>.d</filename> directory: + <programlisting> +session optional pam_motd.so motd=/elsewhere/motd motd_dir=/elsewhere/motd.d </programlisting> </para> </refsect1> @@ -109,6 +139,10 @@ session optional pam_motd.so motd=/etc/motd <para> pam_motd was written by Ben Collins <bcollins@debian.org>. </para> + <para> + The <option>motd_dir=</option> option was added by + Allison Karlitskaya <allison.karlitskaya@redhat.com>. + </para> </refsect1> </refentry> |