.obs/workflows.yml

@@ -3,6 +3,9 @@ rebuild:
     - trigger_services:
         project: system:systemd
         package: systemd
+    - trigger_services:
+        project: system:systemd
+        package: systemd-suse
   filters:
     event: push
     branches:

src/network/networkd-bridge-vlan.c

@@ -245,7 +245,7 @@ int bridge_vlan_set_message(Link *link, sd_netlink_message *m, bool is_set) {
         if (r < 0)
                 return r;
 
-        if (link->master_ifindex <= 0 || streq_ptr(link->kind, "bridge")) {
+        if (link->master_ifindex <= 0 || streq(link->kind, "bridge")) {
                 /* If the setting is requested in a .network file for a bridge master (or a physical master)
                  * interface, then BRIDGE_FLAGS_SELF flag needs to be set. */
                 r = sd_netlink_message_append_u16(m, IFLA_BRIDGE_FLAGS, BRIDGE_FLAGS_SELF);

test/test-network/systemd-networkd-tests.py

@@ -427,8 +427,6 @@ def save_active_units():
             'systemd-networkd.socket',
             'systemd-networkd-varlink.socket',
             'systemd-networkd.service',
-            'systemd-resolved-monitor.socket',
-            'systemd-resolved-varlink.socket',
             'systemd-resolved.service',
             'systemd-timesyncd.service',
             'firewalld.service'
@@ -438,31 +436,19 @@ def save_active_units():
             active_units.append(u)
 
 def restore_active_units():
-    has_network_socket = False
-    has_resolve_socket = False
+    has_socket = False
 
     if 'systemd-networkd.socket' in active_units:
         call('systemctl stop systemd-networkd.socket')
-        has_network_socket = True
+        has_socket = True
 
     if 'systemd-networkd-varlink.socket' in active_units:
         call('systemctl stop systemd-networkd-varlink.socket')
-        has_network_socket = True
+        has_socket = True
 
-    if 'systemd-resolved-monitor.socket' in active_units:
-        call('systemctl stop systemd-resolved-monitor.socket')
-        has_resolve_socket = True
-
-    if 'systemd-resolved-varlink.socket' in active_units:
-        call('systemctl stop systemd-resolved-varlink.socket')
-        has_resolve_socket = True
-
-    if has_network_socket:
+    if has_socket:
         call('systemctl stop systemd-networkd.service')
 
-    if has_resolve_socket:
-        call('systemctl stop systemd-resolved.service')
-
     for u in active_units:
         call(f'systemctl restart {u}')