From abeb98d185277afb87cbdf5b17587f6dcd1f9c7d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 17 Jun 2024 23:08:36 +0900 Subject: [PATCH 1/3] core/mount: suffix function name with paren Follow-up for 88188e1ff1ffa2a4a41c9b8ee127f75cc03bc18d. --- src/core/mount.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/mount.c b/src/core/mount.c index a6460287ced..c6100b0b0a0 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -1832,7 +1832,7 @@ static int mount_setup_unit( assert(fstype); /* Ignore API and credential mount points. They should never be referenced in dependencies ever. - * Also check the comment for mount_point_is_credentials. */ + * Also check the comment for mount_point_is_credentials(). */ if (mount_point_is_api(where) || mount_point_ignore(where) || mount_point_is_credentials(m, where)) return 0; From 87e30d0e56da94241b185b9a17ea3d8ae2387a14 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 17 Jun 2024 23:10:18 +0900 Subject: [PATCH 2/3] json: const char *func() -> const char* func() Follow-up for 309a747fa6cfeac0a0165543f23a924866727c9b. --- src/systemd/sd-json.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/systemd/sd-json.h b/src/systemd/sd-json.h index d86f16106ea..db37821f3ae 100644 --- a/src/systemd/sd-json.h +++ b/src/systemd/sd-json.h @@ -97,7 +97,7 @@ void sd_json_variant_unref_many(sd_json_variant **array, size_t n); _SD_DEFINE_POINTER_CLEANUP_FUNC(sd_json_variant, sd_json_variant_unref); -const char *sd_json_variant_string(sd_json_variant *v); +const char* sd_json_variant_string(sd_json_variant *v); int64_t sd_json_variant_integer(sd_json_variant *v); uint64_t sd_json_variant_unsigned(sd_json_variant *v); double sd_json_variant_real(sd_json_variant *v); @@ -329,7 +329,7 @@ int sd_json_variant_strv(sd_json_variant *v, char ***ret); int sd_json_variant_unbase64(sd_json_variant *v, void **ret, size_t *ret_size); int sd_json_variant_unhex(sd_json_variant *v, void **ret, size_t *ret_size); -const char *sd_json_variant_type_to_string(sd_json_variant_type_t t); +const char* sd_json_variant_type_to_string(sd_json_variant_type_t t); sd_json_variant_type_t sd_json_variant_type_from_string(const char *s); _SD_END_DECLARATIONS; From 4f6d8ab0767e534553bfa130f39dbb07ebb804a4 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 18 Jun 2024 00:09:03 +0900 Subject: [PATCH 3/3] test-network: mention that the captive portal option is supported since v2.20 The current latest release is v2.19, hence the test is typically skipped now. --- test/test-network/systemd-networkd-tests.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 92cb07f11c4..0355c7aca1b 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -5824,6 +5824,8 @@ class NetworkdRATests(unittest.TestCase, Utilities): self.assertIn('pref high', output) self.assertNotIn('pref low', output) + # radvd supports captive portal since v2.20. + # https://github.com/radvd-project/radvd/commit/791179a7f730decbddb2290ef0e34aa85d71b1bc @unittest.skipUnless(radvd_check_config('captive-portal.conf'), "Installed radvd doesn't support captive portals") def test_captive_portal(self): copy_network_unit('25-veth-client.netdev',