mirror of
https://github.com/systemd/systemd
synced 2024-10-02 22:37:25 +00:00
Merge pull request #33375 from yuwata/trivial-follow-ups
Trivial follow ups for recent PRs
This commit is contained in:
commit
0cf5ebeffc
|
@ -1832,7 +1832,7 @@ static int mount_setup_unit(
|
||||||
assert(fstype);
|
assert(fstype);
|
||||||
|
|
||||||
/* Ignore API and credential mount points. They should never be referenced in dependencies ever.
|
/* 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))
|
if (mount_point_is_api(where) || mount_point_ignore(where) || mount_point_is_credentials(m, where))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|
|
@ -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);
|
_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);
|
int64_t sd_json_variant_integer(sd_json_variant *v);
|
||||||
uint64_t sd_json_variant_unsigned(sd_json_variant *v);
|
uint64_t sd_json_variant_unsigned(sd_json_variant *v);
|
||||||
double sd_json_variant_real(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_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);
|
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_json_variant_type_t sd_json_variant_type_from_string(const char *s);
|
||||||
|
|
||||||
_SD_END_DECLARATIONS;
|
_SD_END_DECLARATIONS;
|
||||||
|
|
|
@ -5824,6 +5824,8 @@ class NetworkdRATests(unittest.TestCase, Utilities):
|
||||||
self.assertIn('pref high', output)
|
self.assertIn('pref high', output)
|
||||||
self.assertNotIn('pref low', 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")
|
@unittest.skipUnless(radvd_check_config('captive-portal.conf'), "Installed radvd doesn't support captive portals")
|
||||||
def test_captive_portal(self):
|
def test_captive_portal(self):
|
||||||
copy_network_unit('25-veth-client.netdev',
|
copy_network_unit('25-veth-client.netdev',
|
||||||
|
|
Loading…
Reference in a new issue