dcavalca / rpms / systemd

Forked from rpms/systemd 4 months ago
Clone
Zbigniew Jędrzejewski-Szmek 43ff24
From f096a48e2195d0189742f8ed2e61cb0091d8fc62 Mon Sep 17 00:00:00 2001
Zbigniew Jędrzejewski-Szmek 43ff24
From: Tom Gundersen <teg@jklm.no>
Zbigniew Jędrzejewski-Szmek 43ff24
Date: Mon, 14 Jul 2014 12:25:42 +0200
Zbigniew Jędrzejewski-Szmek 43ff24
Subject: [PATCH] man: systemd.netdev - make it clear that we do not touch
Zbigniew Jędrzejewski-Szmek 43ff24
 preexisting netdevs
Zbigniew Jędrzejewski-Szmek 43ff24
Zbigniew Jędrzejewski-Szmek 43ff24
We will happily use bridges/bonds as master devices, but we will not change their settings if they were created by
Zbigniew Jędrzejewski-Szmek 43ff24
someone else.
Zbigniew Jędrzejewski-Szmek 43ff24
Zbigniew Jędrzejewski-Szmek 43ff24
(cherry picked from commit 7c1cff4ff79f3121189403a8c1b7c350925b3aaa)
Zbigniew Jędrzejewski-Szmek 43ff24
---
Zbigniew Jędrzejewski-Szmek 43ff24
 man/systemd.netdev.xml | 5 ++++-
Zbigniew Jędrzejewski-Szmek 43ff24
 1 file changed, 4 insertions(+), 1 deletion(-)
Zbigniew Jędrzejewski-Szmek 43ff24
Zbigniew Jędrzejewski-Szmek 43ff24
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
Zbigniew Jędrzejewski-Szmek 43ff24
index 857221fdb0..347f80e692 100644
Zbigniew Jędrzejewski-Szmek 43ff24
--- a/man/systemd.netdev.xml
Zbigniew Jędrzejewski-Szmek 43ff24
+++ b/man/systemd.netdev.xml
Zbigniew Jędrzejewski-Szmek 43ff24
@@ -60,7 +60,10 @@
Zbigniew Jędrzejewski-Szmek 43ff24
 
Zbigniew Jędrzejewski-Szmek 43ff24
                 <para>Virtual Network Device files must have the extension
Zbigniew Jędrzejewski-Szmek 43ff24
                 <filename>.netdev</filename>; other extensions are ignored. Virtual
Zbigniew Jędrzejewski-Szmek 43ff24
-                network devices are created as soon as networkd is started.</para>
Zbigniew Jędrzejewski-Szmek 43ff24
+                network devices are created as soon as networkd is started. If a netdev
Zbigniew Jędrzejewski-Szmek 43ff24
+                with the specified name already exists, networkd will use that as-is
Zbigniew Jędrzejewski-Szmek 43ff24
+                rather than create its own. Note that the settings of the pre-existing
Zbigniew Jędrzejewski-Szmek 43ff24
+                netdev will not be changed by networkd.</para>
Zbigniew Jędrzejewski-Szmek 43ff24
 
Zbigniew Jędrzejewski-Szmek 43ff24
                 <para>The <filename>.netdev</filename> files are read from the files located in the
Zbigniew Jędrzejewski-Szmek 43ff24
                 system network directory <filename>/usr/lib/systemd/network</filename>,