Merge pull request #16435 from gaoyi1988/master

fix multi matches when use "||"

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.

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;
 }

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)
+                        if (r != -EEXIST)
-                                log_debug_errno(errno, "Failed to create '%s', ignoring: %m", path);
+                                log_debug_errno(r, "Failed to create '%s', ignoring: %m", path);
                         continue;
                 }
 

src/udev/udev-rules.c

@@ -452,6 +452,11 @@ static int rule_line_add_token(UdevRuleLine *rule_line, UdevRuleTokenType type,
                                 }
                         }
                         *b = '\0';
+
+                        /* Make sure the value is end, so NULSTR_FOREACH can read correct match */
+                        if (b < a)
+                                b[1] = '\0';
+
                         if (bar)
                                 empty = true;
 

test/udev-test.pl

@@ -1322,6 +1322,17 @@ EOF
 KERNEL=="sda", TAG=""
 TAGS=="foo|", SYMLINK+="found"
 TAGS=="aaa|bbb", SYMLINK+="bad"
+EOF
+        },
+        {
+                desc            => "test multi matches 11",
+                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+                exp_name        => "found",
+                not_exp_name    => "bad",
+                rules           => <<EOF
+KERNEL=="sda", TAG="c"
+TAGS=="foo||bar||c", SYMLINK+="found"
+TAGS=="aaa||bbb||ccc", SYMLINK+="bad"
 EOF
         },
         {