diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-11-27 17:02:20 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-11-27 22:35:02 +0100 |
| commit | 94f760ec9d03737da8799739635b25d7ee6c637c (patch) | |
| tree | f0ce63e75f9bde421289b5c42066ec2b01a29cac | |
| parent | 9df4603e5247a01a6bb46afb67e08193faaa07a7 (diff) | |
| download | systemd-94f760ec9d03737da8799739635b25d7ee6c637c.tar.gz | |
man,factory: update factory config for nsswitch.conf to match the man pages
Also add a note in the man pages to remind people to adjust the factory config
and other man pages at the same time.
| -rw-r--r-- | factory/etc/nsswitch.conf | 17 | ||||
| -rw-r--r-- | man/nss-myhostname.xml | 1 | ||||
| -rw-r--r-- | man/nss-mymachines.xml | 1 | ||||
| -rw-r--r-- | man/nss-resolve.xml | 1 | ||||
| -rw-r--r-- | man/nss-systemd.xml | 1 |
5 files changed, 17 insertions, 4 deletions
diff --git a/factory/etc/nsswitch.conf b/factory/etc/nsswitch.conf index 5f2984e77f..5470993e34 100644 --- a/factory/etc/nsswitch.conf +++ b/factory/etc/nsswitch.conf @@ -1,6 +1,15 @@ # This file is part of systemd. -passwd: files -shadow: files -group: files -hosts: files mymachines resolve myhostname +passwd: compat mymachines systemd +group: compat mymachines systemd +shadow: compat + +hosts: files mymachines resolve [!UNAVAIL=return] dns myhostname +networks: files + +protocols: db files +services: db files +ethers: db files +rpc: db files + +netgroup: nis diff --git a/man/nss-myhostname.xml b/man/nss-myhostname.xml index 18a6f5f665..e447420f53 100644 --- a/man/nss-myhostname.xml +++ b/man/nss-myhostname.xml @@ -81,6 +81,7 @@ <para>Here is an example <filename>/etc/nsswitch.conf</filename> file that enables <command>nss-myhostname</command> correctly:</para> + <!-- synchronize with other nss-* man pages and factory/etc/nsswitch.conf --> <programlisting>passwd: compat mymachines systemd group: compat mymachines systemd shadow: compat diff --git a/man/nss-mymachines.xml b/man/nss-mymachines.xml index d9811b24cc..a0a0f99684 100644 --- a/man/nss-mymachines.xml +++ b/man/nss-mymachines.xml @@ -58,6 +58,7 @@ <para>Here is an example <filename>/etc/nsswitch.conf</filename> file that enables <command>nss-mymachines</command> correctly:</para> + <!-- synchronize with other nss-* man pages and factory/etc/nsswitch.conf --> <programlisting>passwd: compat <command>mymachines</command> systemd group: compat <command>mymachines</command> systemd shadow: compat diff --git a/man/nss-resolve.xml b/man/nss-resolve.xml index d747e0b1e5..960d580003 100644 --- a/man/nss-resolve.xml +++ b/man/nss-resolve.xml @@ -64,6 +64,7 @@ <para>Here is an example <filename>/etc/nsswitch.conf</filename> file that enables <command>nss-resolve</command> correctly:</para> + <!-- synchronize with other nss-* man pages and factory/etc/nsswitch.conf --> <programlisting>passwd: compat mymachines systemd group: compat mymachines systemd shadow: compat diff --git a/man/nss-systemd.xml b/man/nss-systemd.xml index 323f9ab868..d3d68437de 100644 --- a/man/nss-systemd.xml +++ b/man/nss-systemd.xml @@ -55,6 +55,7 @@ <para>Here is an example <filename>/etc/nsswitch.conf</filename> file that enables <command>nss-systemd</command> correctly:</para> + <!-- synchronize with other nss-* man pages and factory/etc/nsswitch.conf --> <programlisting>passwd: compat mymachines <command>systemd</command> group: compat mymachines <command>systemd</command> shadow: compat |