Merge pull request #16435 from gaoyi1988/master

fix multi matches when use "||"

diff --git a/NEWS b/NEWS
index a393157035e1d32daba3a13269a2eee0f9ef0688..3fea3d221e4ae6341b49e11da8109cb1afef2175 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -217,6 +217,9 @@ CHANGES WITH 246:
           Description"). Support for "MUD" URLs was also added to the LLDP
           stack, configurable in the [LLDP] section in .network files.
 
+        * The Mode= settings in [MACVLAN] and [MACVTAP] now support 'source'
+          mode. Also, the sections now support a new setting SourceMACAddress=.
+
         * systemd-networkd's .netdev files now support a new setting
           VLANProtocol= in the [Bridge] section that allows configuration of
           the VLAN protocol to use.

diff --git a/src/core/namespace.c b/src/core/namespace.c
index ebdbb7545b0d669ed704c26221a42bd2da9fb131..20f8beab1a15b4edfd443fe4bd7ff7e1a121cf2b 100644 (file)
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -876,7 +876,7 @@ static int mount_tmpfs(const MountEntry *m) {
 
         r = label_fix_container(entry_path, source_path, 0);
         if (r < 0)
-                return log_error_errno(r, "Failed to fix label of '%s' as '%s': %m", entry_path, source_path);
+                return log_debug_errno(r, "Failed to fix label of '%s' as '%s': %m", entry_path, source_path);
 
         return 1;
 }

diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c
index 7641909c1b2c9d29b337e0633dde19a215d9cc03..6e57e2a99d3a79fd3f22d39239bfc4c93431d0ab 100644 (file)
--- a/src/shared/dev-setup.c
+++ b/src/shared/dev-setup.c
@@ -107,8 +107,8 @@ int make_inaccessible_nodes(
                 else
                         r = mknod_label(path, table[i].mode, makedev(0, 0));
                 if (r < 0) {
-                        if (errno != EEXIST)
-                                log_debug_errno(errno, "Failed to create '%s', ignoring: %m", path);
+                        if (r != -EEXIST)
+                                log_debug_errno(r, "Failed to create '%s', ignoring: %m", path);
                         continue;
                 }