NEWS

@@ -565,8 +565,6 @@ CHANGES WITH 246:
         Korman, YmrDtnJu, Yuri Chornoivan, Yu Watanabe, Zbigniew
         Jędrzejewski-Szmek, Zhu Li, Дамјан Георгиевски, наб
 
-        – Warsaw, 2020-07-09
-
 CHANGES WITH 245:
 
         * A new tool "systemd-repart" has been added, that operates as an

src/shared/userdb.c

@@ -1231,7 +1231,7 @@ int userdb_block_nss_systemd(int b) {
 
         /* Note that we might be called from libnss_systemd.so.2 itself, but that should be fine, really. */
 
-        dl = dlopen(ROOTLIBDIR "/libnss_systemd.so.2", RTLD_LAZY|RTLD_NODELETE);
+        dl = dlopen(ROOTLIBDIR "libnss_systemd.so.2", RTLD_LAZY|RTLD_NODELETE);
         if (!dl) {
                 /* If the file isn't installed, don't complain loudly */
                 log_debug("Failed to dlopen(libnss_systemd.so.2), ignoring: %s", dlerror());

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

@@ -2879,7 +2879,8 @@ class NetworkdBridgeTests(unittest.TestCase, Utilities):
             with self.subTest(test=test):
                 if test == 'no-slave':
                     # bridge has no slaves; it's up but *might* not have carrier
-                    self.wait_operstate('bridge99', operstate=r'(no-carrier|routable)', setup_state=None, setup_timeout=30)
+                    # It may take very long time that the interface become configured state.
+                    self.wait_online(['bridge99:no-carrier'], timeout='2m', setup_state=None)
                     # due to a bug in the kernel, newly-created bridges are brought up
                     # *with* carrier, unless they have had any setting changed; e.g.
                     # their mac set, priority set, etc.  Then, they will lose carrier
@@ -2890,7 +2891,7 @@ class NetworkdBridgeTests(unittest.TestCase, Utilities):
                     # add slave to bridge, but leave it down; bridge is definitely no-carrier
                     self.check_link_attr('test1', 'operstate', 'down')
                     check_output('ip link set dev test1 master bridge99')
-                    self.wait_operstate('bridge99', operstate='no-carrier', setup_state=None)
+                    self.wait_online(['bridge99:no-carrier:no-carrier'], setup_state=None)
                     self.check_link_attr('bridge99', 'carrier', '0')
                 elif test == 'slave-up':
                     # bring up slave, which will have carrier; bridge gains carrier
@@ -2914,6 +2915,7 @@ class NetworkdBridgeTests(unittest.TestCase, Utilities):
                     self.check_link_attr('bridge99', 'carrier', '0')
 
                 output = check_output(*networkctl_cmd, '-n', '0', 'status', 'bridge99', env=env)
+                print(output)
                 self.assertRegex(output, '10.1.2.3')
                 self.assertRegex(output, '10.1.2.1')