summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-07-17 16:49:39 +0200
committerTom Gundersen <teg@jklm.no>2014-07-17 22:53:35 +0200
commit560852ced07a647e2d288ce2932aaf608712867d (patch)
tree9047b2e2dc0ca27ef54da3ef3efb900b96af0f6e
parent962225baa862c2023790b3c7f140d22bac9e801f (diff)
sd-network: expose 'unmanaged' as a regular state
This is useful to save in the consumer of the lib, unlike ENODATA/EBUSY which means that the user should wait until a useful state is available.
-rw-r--r--src/network/sd-network.c4
-rw-r--r--src/systemd/sd-network.h3
2 files changed, 2 insertions, 5 deletions
diff --git a/src/network/sd-network.c b/src/network/sd-network.c
index 1b7518fd94..50e5d9be1f 100644
--- a/src/network/sd-network.c
+++ b/src/network/sd-network.c
@@ -85,9 +85,7 @@ _public_ int sd_network_get_link_state(unsigned index, char **state) {
else if (!s)
return -EIO;
- if (streq(s, "unmanaged"))
- return -EUNATCH;
- else if (streq(s, "initializing"))
+ if (streq(s, "initializing"))
return -EBUSY;
*state = s;
diff --git a/src/systemd/sd-network.h b/src/systemd/sd-network.h
index 45fd3ce08e..3f79482228 100644
--- a/src/systemd/sd-network.h
+++ b/src/systemd/sd-network.h
@@ -52,10 +52,9 @@
_SD_BEGIN_DECLARATIONS;
/* Get state from ifindex.
- * Possible states: failed, configuring, configured
+ * Possible states: failed, configuring, configured, unmanaged
* Possible return codes:
* -ENODATA: networkd is not aware of the link
- * -EUNATCH: networkd is not managing this link
* -EBUSY: udev is still processing the link, networkd does not yet know if it will manage it
*/
int sd_network_get_link_state(unsigned ifindex, char **state);