X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fnet%2Flink-config.c;h=883aedc73ca456f24286a2465609053b4b628fb9;hb=c50e28a38ccbdd1e1d1f082dd67bb3e74be4d459;hp=cf966bfe372f3d587adb69835ffeff992cff88dd;hpb=3aeb37bc4f32b5edc334f2ac7c5d3c7b0a121328;p=elogind.git diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index cf966bfe3..883aedc73 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -44,6 +44,8 @@ struct link_config_ctx { int ethtool_fd; + bool enable_name_policy; + sd_rtnl *rtnl; char **link_dirs; @@ -67,9 +69,14 @@ int link_config_ctx_new(link_config_ctx **ret) { ctx->ethtool_fd = -1; + ctx->enable_name_policy = true; + ctx->link_dirs = strv_new("/etc/systemd/network", "/run/systemd/network", "/usr/lib/systemd/network", +#ifdef HAVE_SPLIT_USR + "/lib/systemd/network", +#endif NULL); if (!ctx->link_dirs) { log_error("failed to build link config directory array"); @@ -168,7 +175,7 @@ static int load_link(link_config_ctx *ctx, const char *filename) { log_warning("Colud not parse config file %s: %s", filename, strerror(-r)); goto failure; } else - log_info("Parsed configuration file %s", filename); + log_debug("Parsed configuration file %s", filename); link->filename = strdup(filename); @@ -181,12 +188,37 @@ failure: return r; } +static bool enable_name_policy(void) { + _cleanup_free_ char *line; + char *w, *state; + int r; + size_t l; + + r = read_one_line_file("/proc/cmdline", &line); + if (r < 0) { + log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); + return true; /* something is very wrong, let's not make it worse */ + } + + FOREACH_WORD_QUOTED(w, l, line, state) + if (strneq(w, "net.ifnames=0", l)) + return false; + + return true; +} + int link_config_load(link_config_ctx *ctx) { int r; char **files, **f; link_configs_free(ctx); + + if (!enable_name_policy()) { + ctx->enable_name_policy = false; + log_info("Network interface NamePolicy= disabled on kernel commandline, ignoring."); + } + /* update timestamp */ paths_check_timestamp(ctx->link_dirs, &ctx->link_dirs_ts_usec, true); @@ -255,10 +287,8 @@ int link_config_get(link_config_ctx *ctx, struct udev_device *device, link_confi link_config *link; LIST_FOREACH(links, link, ctx->links) { - if (!match_config(link, device)) { - log_info("Config file %s does not apply to device %s", link->filename, udev_device_get_sysname(device)); - } else { - log_info("Config file %s applies to device %s", link->filename, udev_device_get_sysname(device)); + if (match_config(link, device)) { + log_debug("Config file %s applies to device %s", link->filename, udev_device_get_sysname(device)); *ret = link; return 0; } @@ -267,25 +297,6 @@ int link_config_get(link_config_ctx *ctx, struct udev_device *device, link_confi return -ENOENT; } -static bool enable_name_policy(void) { - _cleanup_free_ char *line; - char *w, *state; - int r; - size_t l; - - r = read_one_line_file("/proc/cmdline", &line); - if (r < 0) { - log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); - return true; /* something is very wrong, let's not make it worse */ - } - - FOREACH_WORD_QUOTED(w, l, line, state) - if (strneq(w, "net.ifnames=0", l)) - return false; - - return true; -} - static bool mac_is_random(struct udev_device *device) { const char *s; unsigned type; @@ -365,40 +376,43 @@ static int get_mac(struct udev_device *device, bool want_random, struct ether_ad return 0; } -int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_device *device) { - const char *name; +int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_device *device, const char **name) { + const char *old_name; const char *new_name = NULL; struct ether_addr generated_mac; struct ether_addr *mac = NULL; int r, ifindex; + assert(ctx); + assert(config); + assert(device); + assert(name); + r = link_config_ctx_connect(ctx); if (r < 0) return r; - name = udev_device_get_sysname(device); - if (!name) + old_name = udev_device_get_sysname(device); + if (!old_name) return -EINVAL; - log_info("Configuring %s", name); - if (config->description) { r = udev_device_set_sysattr_value(device, "ifalias", config->description); if (r < 0) log_warning("Could not set description of %s to '%s': %s", - name, config->description, strerror(-r)); + old_name, config->description, strerror(-r)); } - r = ethtool_set_speed(ctx->ethtool_fd, name, config->speed, config->duplex); + r = ethtool_set_speed(ctx->ethtool_fd, old_name, config->speed, config->duplex); if (r < 0) log_warning("Could not set speed or duplex of %s to %u Mbytes (%s): %s", - name, config->speed, duplex_to_string(config->duplex), strerror(-r)); + old_name, config->speed, duplex_to_string(config->duplex), strerror(-r)); - r = ethtool_set_wol(ctx->ethtool_fd, name, config->wol); + r = ethtool_set_wol(ctx->ethtool_fd, old_name, config->wol); if (r < 0) log_warning("Could not set WakeOnLan of %s to %s: %s", - name, wol_to_string(config->wol), strerror(-r)); + old_name, wol_to_string(config->wol), strerror(-r)); ifindex = udev_device_get_ifindex(device); if (ifindex <= 0) { @@ -406,7 +420,7 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev return -ENODEV; } - if (config->name_policy && enable_name_policy()) { + if (ctx->enable_name_policy && config->name_policy) { NamePolicy *policy; for (policy = config->name_policy; !new_name && *policy != _NAMEPOLICY_INVALID; policy++) { @@ -429,9 +443,12 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev } } - if (!new_name && config->name) { - new_name = config->name; - } + if (new_name) + *name = new_name; /* a name was set by a policy */ + else if (config->name) + *name = config->name; /* a name was set manually in the config */ + else + *name = NULL; switch (config->mac_policy) { case MACPOLICY_PERSISTENT: @@ -454,9 +471,9 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev mac = config->mac; } - r = rtnl_set_link_properties(ctx->rtnl, ifindex, new_name, mac, config->mtu); + r = rtnl_set_link_properties(ctx->rtnl, ifindex, mac, config->mtu); if (r < 0) { - log_warning("Could not set Name, MACAddress or MTU on %s: %s", name, strerror(-r)); + log_warning("Could not set MACAddress or MTU on %s: %s", old_name, strerror(-r)); return r; }