network-generator: also copy drop-ins for networkd.conf from credential

Follow-up for 1a30285590c2f40f256d0628950ef9243b2c1938.

diff --git a/man/systemd-network-generator.service.xml b/man/systemd-network-generator.service.xml
index 59d608028a70a0659859103356ea2f2ca6558a12..8962f1a05f3e0a365558969ada816a0b3027959e 100644 (file)
--- a/man/systemd-network-generator.service.xml
+++ b/man/systemd-network-generator.service.xml
@@ -128,13 +128,15 @@
 
     <variablelist class='system-credentials'>
       <varlistentry>
-        <term><varname>network.netdev.*</varname></term>
+        <term><varname>network.conf.*</varname></term>
         <term><varname>network.link.*</varname></term>
+        <term><varname>network.netdev.*</varname></term>
         <term><varname>network.network.*</varname></term>
 
         <listitem><para>These credentials should contain valid
-        <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>networkd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.link</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>
         configuration data. From each matching credential a separate file is created. Example: a passed
         credential <filename>network.link.50-foobar</filename> will be copied into a configuration file

diff --git a/man/systemd.system-credentials.xml b/man/systemd.system-credentials.xml
index 271c495d2a333c31399369b4361081aef14213e6..e8e2985a42b26e11c1b8fca909292984d6f5e8f4 100644 (file)
--- a/man/systemd.system-credentials.xml
+++ b/man/systemd.system-credentials.xml
@@ -138,20 +138,21 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>network.netdev.*</varname></term>
+        <term><varname>network.conf.*</varname></term>
         <term><varname>network.link.*</varname></term>
+        <term><varname>network.netdev.*</varname></term>
         <term><varname>network.network.*</varname></term>
         <listitem>
           <para>Configures network devices. Read by
-          <citerefentry><refentrytitle>systemd-network-generator.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>. These
-          credentials directly translate to a matching <filename>*.netdev</filename>,
-          <filename>*.link</filename> or <filename>*.network</filename> file. Example: the contents of a
-          credential <filename>network.link.50-foobar</filename> will be copied into a file
-          <filename>50-foobar.link</filename>. See
-          <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+          <citerefentry><refentrytitle>systemd-network-generator.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+          These credentials should contain valid
+          <citerefentry><refentrytitle>networkd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
           <citerefentry><refentrytitle>systemd.link</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+          <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
           <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-          for details.</para>
+          configuration data. From each matching credential a separate file is created. Example: the contents
+          of a credential <filename>network.link.50-foobar</filename> will be copied into a file
+          <filename>50-foobar.link</filename>.</para>
 
           <para>Note that the resulting files are created world-readable, it's hence recommended to not include
           secrets in these credentials, but supply them via separate credentials directly to

diff --git a/src/network/generator/main.c b/src/network/generator/main.c
index 5a26a54fc568cc625ccc272235f823c9769683f8..0911656e889c01057f165f229ca85dbc7c9e1175 100644 (file)
--- a/src/network/generator/main.c
+++ b/src/network/generator/main.c
@@ -234,9 +234,10 @@ static int run(int argc, char *argv[]) {
         RET_GATHER(ret, context_save(&context));
 
         static const PickUpCredential table[] = {
-                { "network.link.",    NETWORK_UNIT_DIRECTORY, ".link"    },
-                { "network.netdev.",  NETWORK_UNIT_DIRECTORY, ".netdev"  },
-                { "network.network.", NETWORK_UNIT_DIRECTORY, ".network" },
+                { "network.conf.",    "/run/systemd/networkd.conf.d/", ".conf"    },
+                { "network.link.",    NETWORK_UNIT_DIRECTORY,          ".link"    },
+                { "network.netdev.",  NETWORK_UNIT_DIRECTORY,          ".netdev"  },
+                { "network.network.", NETWORK_UNIT_DIRECTORY,          ".network" },
         };
         RET_GATHER(ret, pick_up_credentials(table, ELEMENTSOF(table)));