picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

udev: net_setup - clarify reason for failure of persistent mac address policy

This commit is contained in:
Tom Gundersen 2015-02-06 08:36:17 +01:00
parent ee46e55570
commit 1c25683e0f
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
man/systemd.link.xml
View File

@ -216,7 +216,10 @@
nothing is done. Otherwise, a new MAC address is
generated which is guaranteed to be the same on every
boot for the given machine and the given device, but
which is otherwise random.</para>
which is otherwise random. This feature depends on ID_NET_NAME_*
properties existing for the link, on hardware where these
properties are not set the generation of a persistent mac address
will fail.</para>
</listitem>
</varlistentry>
<varlistentry>

10
src/udev/net/link-config.c
View File

@ -438,9 +438,10 @@ int link_config_apply(link_config_ctx *ctx, link_config *config,
case MACPOLICY_PERSISTENT:
if (mac_is_random(device)) {
r = get_mac(device, false, &generated_mac);
if (r == -ENOENT)
if (r == -ENOENT) {
log_warning_errno(r, "Could not generate persistent MAC address for %s: %m", old_name);
break;
else if (r < 0)
} else if (r < 0)
return r;
mac = &generated_mac;
}
@ -448,9 +449,10 @@ int link_config_apply(link_config_ctx *ctx, link_config *config,
case MACPOLICY_RANDOM:
if (!mac_is_random(device)) {
r = get_mac(device, true, &generated_mac);
if (r == -ENOENT)
if (r == -ENOENT) {
log_warning_errno(r, "Could not generate random MAC address for %s: %m", old_name);
break;
else if (r < 0)
} else if (r < 0)
return r;
mac = &generated_mac;
}