SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-device: make sd_device_get_is_initialized() returns is_initialized by return value

Browse Source
This commit is contained in:
Yu Watanabe
2018-10-29 17:33:33 +09:00
parent 78ffb476f2
commit 5a937ea2f6
9 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn-network.c
+3 -4
View File
@@ -395,7 +395,7 @@ int remove_bridge(const char *bridge_name) {
static int parse_interface(const char *name) {
_cleanup_(sd_device_unrefp) sd_device *d = NULL;
char ifi_str[2 + DECIMAL_STR_MAX(int)];
int ifi, initialized, r;
int ifi, r;
ifi = (int) if_nametoindex(name);
if (ifi <= 0)
@@ -406,11 +406,10 @@ static int parse_interface(const char *name) {
if (r < 0)
return log_error_errno(r, "Failed to get device for interface %s: %m", name);
r = sd_device_get_is_initialized(d, &initialized);
r = sd_device_get_is_initialized(d);
if (r < 0)
return log_error_errno(r, "Failed to determine whether interface %s is initialized or not: %m", name);
if (!initialized) {
if (r == 0) {
log_error("Network interface %s is not initialized yet.", name);
return -EBUSY;
}