NEWS: add date

userdb: fix dlopen call
The call would always fail with: systemd-userwork[780]: Failed to dlopen(libnss_systemd.so.2), ignoring: /usr/lib64libnss_systemd.so.2: cannot open shared object file: No such file or directory
2020-07-09 08:35:37 +02:00 · 2020-07-09 07:55:56 +02:00 · 2020-07-09 14:01:45 +09:00 · 2020-07-08 17:05:03 -04:00 · 2020-07-08 16:13:14 -04:00
3 changed files with 5 additions and 5 deletions
--- a/2
+++ b/2
@ -565,6 +565,8 @@ 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
--- a/src/shared/userdb.c
+++ b/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());
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@ -2879,8 +2879,7 @@ 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
-                    # It may take very long time that the interface become configured state.
+                    self.wait_operstate('bridge99', operstate=r'(no-carrier|routable)', setup_state=None, setup_timeout=30)
                    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
@ -2891,7 +2890,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_online(['bridge99:no-carrier:no-carrier'], setup_state=None)
+                    self.wait_operstate('bridge99', operstate='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
@ -2915,7 +2914,6 @@ 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')
Author	SHA1	Message	Date
Zbigniew Jędrzejewski-Szmek	976efe1b80	NEWS: add date	2020-07-09 08:35:37 +02:00
Zbigniew Jędrzejewski-Szmek	a127c6208f	userdb: fix dlopen call The call would always fail with: systemd-userwork[780]: Failed to dlopen(libnss_systemd.so.2), ignoring: /usr/lib64libnss_systemd.so.2: cannot open shared object file: No such file or directory	2020-07-09 07:55:56 +02:00
Yu Watanabe	5157d719f0	Merge pull request #16411 from ddstreet/bridge_without_carrier_fails Bridge without carrier fails	2020-07-09 14:01:45 +09:00
Dan Streetman	001c07cfff	test-netowrk: in test_bridge_configure_without_carrier, avoid strange test failures For some reason the wait-online is failing intermittently; it's unclear exactly why, but this hopefully avoids the failure for unrelated PR. This is a workaround (not fix) for #16105	2020-07-08 17:05:03 -04:00
Dan Streetman	4e3376d43a	test-network: don't print networkctl output for passing subtests This just clutters up the logs.	2020-07-08 16:13:14 -04:00