From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 27 Nov 2018 16:02:20 +0000 (+0100)
Subject: man,factory: update factory config for nsswitch.conf to match the man pages
X-Git-Tag: v240~202
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94f760ec9d03737da8799739635b25d7ee6c637c;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/factory/etc/nsswitch.conf b/factory/etc/nsswitch.conf
index 5f2984e77f1..5470993e34b 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 18a6f5f665a..e447420f53e 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 d9811b24cc5..a0a0f99684d 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 d747e0b1e52..960d580003d 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 323f9ab8688..d3d68437de3 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