[systemd-commits] 2 commits - man/systemd.socket.xml src/network

[Tom Gundersen]

 man/systemd.socket.xml      |    6 +++---
 src/network/networkd-link.c |    9 ---------
 2 files changed, 3 insertions(+), 12 deletions(-)

New commits:
commit 281a92f80c215d6e07526d33563adb6d37c531c6
Author: Ivan Shapovalov <intelfx100 at gmail.com>
Date:   Mon Oct 27 12:07:36 2014 +0300

    man: fix typos in description of SELinuxContextFromNet=

diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index ce04b0b..57f769f 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -678,7 +678,7 @@
                         <varlistentry>
                           <term><varname>SELinuxContextFromNet=</varname></term>
                                  <listitem><para>Takes a boolean
-                                 argument. When true systemd will attempt
+                                 argument. When true, systemd will attempt
                                  to figure out the SELinux label used
                                  for the instantiated service from the
                                  information handed by the peer over the
@@ -688,9 +688,9 @@
                                  the resulting SELinux context originate
                                  from either the target binary that is
                                  effectively triggered by socket unit
-                                 are taken from the value of the
+                                 or from the value of the
                                  <varname>SELinuxContext=</varname>
-                                 option.This configuration option only
+                                 option. This configuration option only
                                  affects sockets with
                                  <varname>Accept=</varname> mode set to
                                  <literal>true</literal>. Also note that

commit dbafa734d8d6ba4cb5efcbb2260105babcdcde1e
Author: Tom Gundersen <teg at jklm.no>
Date:   Sun Oct 26 14:01:27 2014 +0100

    networkd: don't stop the dhcp server when link goes down

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index c6e173f..26ef0fe 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -344,15 +344,6 @@ static int link_stop_clients(Link *link) {
                 }
         }
 
-        if (link->dhcp_server) {
-                k = sd_dhcp_server_stop(link->dhcp_server);
-                if (k < 0) {
-                        log_warning_link(link, "Could not stop DHCPv4 server: %s",
-                                         strerror(-r));
-                        r = k;
-                }
-        }
-
         if(link->icmp6_router_discovery) {
 
                 if (link->dhcp6_client) {