[systemd-commits] 5 commits - src/network TODO units/systemd-networkd.service.in
Tom Gundersen
tomegun at kemper.freedesktop.org
Fri May 16 05:52:15 PDT 2014
TODO | 4 ++++
src/network/networkd-address.c | 4 ++--
src/network/networkd-link.c | 10 ++++++----
src/network/networkd-netdev.c | 2 +-
src/network/networkd-network.c | 4 ++--
src/network/networkd-route.c | 4 ++--
src/network/networkd.h | 4 ++--
units/systemd-networkd.service.in | 2 +-
8 files changed, 20 insertions(+), 14 deletions(-)
New commits:
commit 7da489e630d1c608179d7aea66342c0ec5440932
Author: Tom Gundersen <teg at jklm.no>
Date: Fri May 16 14:48:58 2014 +0200
Revert "networkd: order after udev kernel socket"
This reverts commit a555350d47c4b70d716a63424933b34902c98300.
This did not fix the problem, just made it harder to hit.
diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in
index f0df671..fc3b14a 100644
--- a/units/systemd-networkd.service.in
+++ b/units/systemd-networkd.service.in
@@ -9,7 +9,7 @@
Description=Network Service
Documentation=man:systemd-networkd.service(8)
DefaultDependencies=no
-After=dbus.service systemd-udevd-kernel.socket
+After=dbus.service
Before=network.target
Wants=network.target
ConditionCapability=CAP_NET_ADMIN
commit 3c4cb0645c8e1e2ae37d775da8e5201fa06da9cf
Author: Tom Gundersen <teg at jklm.no>
Date: Fri May 16 14:47:43 2014 +0200
networkd: log the initialization status of links
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 34b8d61..d3777c8 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1690,7 +1690,7 @@ int link_initialized(Link *link, struct udev_device *device) {
if (device)
link->udev_device = udev_device_ref(device);
- log_debug_link(link, "link initialized");
+ log_info_link(link, "udev initialized link");
r = network_get(link->manager, device, link->ifname, &link->mac, &network);
if (r == -ENOENT) {
@@ -1861,9 +1861,11 @@ int link_add(Manager *m, sd_rtnl_message *message, Link **ret) {
return -errno;
}
- if (udev_device_get_is_initialized(device) <= 0)
+ if (udev_device_get_is_initialized(device) <= 0) {
/* not yet ready */
+ log_info_link(link, "udev initializing link...");
return 0;
+ }
}
r = link_initialized(link, device);
commit 8f5675cc75051f9c38f6093ea354aab6a17aed43
Author: Tom Gundersen <teg at jklm.no>
Date: Fri May 16 00:26:37 2014 +0200
TODO
diff --git a/TODO b/TODO
index 1ef1890..0e2e2d4 100644
--- a/TODO
+++ b/TODO
@@ -705,6 +705,10 @@ Features:
- add veth netdev support (c.f. http://shorewall.net/bridge-Shorewall-perl.html#veth)
- add tun/tap netdev support
+* dhcp:
+ - export timezone information
+ - FORCERENEW
+
External:
* dbus:
commit 3d94b7870c991701a439bb7862624c813bc9aeed
Author: Tom Gundersen <teg at jklm.no>
Date: Thu May 15 23:14:52 2014 +0200
networkd: fix typo
diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index 8623274..c54b0c1 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -224,7 +224,7 @@ static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userda
if (r == -EEXIST)
log_debug_netdev(netdev, "netdev exists, using existing");
else if (r < 0) {
- log_warning_netdev(netdev, "netdev could not be greated: %s", strerror(-r));
+ log_warning_netdev(netdev, "netdev could not be created: %s", strerror(-r));
netdev_drop(netdev);
return 1;
commit 3d3d425547a3f38473fcf8737b85dfebb630479d
Author: Tom Gundersen <teg at jklm.no>
Date: Thu May 15 20:10:33 2014 +0200
networkd: rename Address and Route list fields
diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 87688a5..e6e3f8f 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -59,7 +59,7 @@ int address_new_static(Network *network, unsigned section, Address **ret) {
address->network = network;
- LIST_PREPEND(static_addresses, network->static_addresses, address);
+ LIST_PREPEND(addresses, network->static_addresses, address);
if (section) {
address->section = section;
@@ -92,7 +92,7 @@ void address_free(Address *address) {
return;
if (address->network) {
- LIST_REMOVE(static_addresses, address->network->static_addresses, address);
+ LIST_REMOVE(addresses, address->network->static_addresses, address);
if (address->section)
hashmap_remove(address->network->addresses_by_section,
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 8dd742a..34b8d61 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -291,7 +291,7 @@ static int link_enter_set_routes(Link *link) {
log_debug_link(link, "setting routes");
- LIST_FOREACH(static_routes, rt, link->network->static_routes) {
+ LIST_FOREACH(routes, rt, link->network->static_routes) {
r = route_configure(rt, link, &route_handler);
if (r < 0) {
log_warning_link(link,
@@ -487,7 +487,7 @@ static int link_enter_set_addresses(Link *link) {
log_debug_link(link, "setting addresses");
- LIST_FOREACH(static_addresses, ad, link->network->static_addresses) {
+ LIST_FOREACH(addresses, ad, link->network->static_addresses) {
r = address_configure(ad, link, &address_handler);
if (r < 0) {
log_warning_link(link,
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 76381c4..2a68d3e 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -98,7 +98,7 @@ static int network_load_one(Manager *manager, const char *filename) {
LIST_PREPEND(networks, manager->networks, network);
- LIST_FOREACH(static_routes, route, network->static_routes) {
+ LIST_FOREACH(routes, route, network->static_routes) {
if (!route->family) {
log_warning("Route section without Gateway field configured in %s. "
"Ignoring", filename);
@@ -106,7 +106,7 @@ static int network_load_one(Manager *manager, const char *filename) {
}
}
- LIST_FOREACH(static_addresses, address, network->static_addresses) {
+ LIST_FOREACH(addresses, address, network->static_addresses) {
if (!address->family) {
log_warning("Address section without Address field configured in %s. "
"Ignoring", filename);
diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 8b020ad..d0a04ec 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -52,7 +52,7 @@ int route_new_static(Network *network, unsigned section, Route **ret) {
route->network = network;
- LIST_PREPEND(static_routes, network->static_routes, route);
+ LIST_PREPEND(routes, network->static_routes, route);
if (section) {
route->section = section;
@@ -86,7 +86,7 @@ void route_free(Route *route) {
return;
if (route->network) {
- LIST_REMOVE(static_routes, route->network->static_routes, route);
+ LIST_REMOVE(routes, route->network->static_routes, route);
if (route->section)
hashmap_remove(route->network->routes_by_section,
diff --git a/src/network/networkd.h b/src/network/networkd.h
index f250f19..e2e15b5 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -172,7 +172,7 @@ struct Address {
struct in6_addr in6;
} in_addr;
- LIST_FIELDS(Address, static_addresses);
+ LIST_FIELDS(Address, addresses);
};
struct Route {
@@ -194,7 +194,7 @@ struct Route {
struct in6_addr in6;
} dst_addr;
- LIST_FIELDS(Route, static_routes);
+ LIST_FIELDS(Route, routes);
};
typedef enum LinkState {
More information about the systemd-commits
mailing list