-https://bugs.freedesktop.org/show_bug.cgi?id=53837
+From: Michael Biebl <biebl@debian.org>
+Date: Thu, 18 Jul 2013 01:04:07 +0200
+Subject: Revert "udev: network device renaming - immediately give up if the
+ target name isn't available"
-Kay Sievers <kay@vrfy.org> changed:
+This reverts commit 97595710b77aa162ca5e20da57d0a1ed7355eaad.
- What |Removed |Added
-----------------------------------------------------------------------------
- Status|NEW |RESOLVED
- Resolution| |WONTFIX
+Since we are keeping the old persistent network interface naming for
+now, and make the new naming scheme [1] explictly opt-in [2], re-apply
+this old hack to make the renaming less likely to fail.
---- Comment #1 from Kay Sievers <kay@vrfy.org> 2012-08-20 12:12:56 UTC ---
-Please use biosdevname or name the devices other than ethX.
-
-We do not try to race against the kernel anymore, and therefore do not
-support swapping names around in the kernel namespace.
-
-In short: Devices can no longer be renamed to ethX.
-
-============================================================================
-
-Revert 97595710b77aa162ca5e20da57d0a1ed7355eaad
-
-From: Kay Sievers <kay@vrfy.org>
-Date: Thu, 05 Jul 2012 15:40:50 +0000
-Subject: udev: network device renaming - immediately give up if the target name isn't available
+[1] http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/
+[2] d5051f7666e25ecf2b32c7076ce18c1de969d01b
+---
+ src/udev/udev-event.c | 41 ++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 38 insertions(+), 3 deletions(-)
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
-index 2ade0ab..aff1487 100644
+index bc115f1..a673f51 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
-@@ -745,11 +745,32 @@ out:
- return err;
- }
-
-+static void rename_netif_kernel_log(struct ifreq ifr)
-+{
-+ int klog;
-+ FILE *f;
-+
-+ klog = open("/dev/kmsg", O_WRONLY|O_CLOEXEC);
-+ if (klog < 0)
-+ return;
-+
-+ f = fdopen(klog, "w");
-+ if (f == NULL) {
-+ close(klog);
-+ return;
-+ }
-+
-+ fprintf(f, "<30>udevd[%u]: renamed network interface %s to %s\n",
-+ getpid(), ifr.ifr_name, ifr.ifr_newname);
-+ fclose(f);
-+}
-+
- static int rename_netif(struct udev_event *event)
- {
- struct udev_device *dev = event->dev;
- int sk;
- struct ifreq ifr;
+@@ -769,18 +769,53 @@ static int rename_netif(struct udev_event *event) {
+ char name[IFNAMSIZ];
+ const char *oldname;
+ int r;
+ int loop;
- int err;
- log_debug("changing net interface name from '%s' to '%s'\n",
-@@ -766,12 +787,49 @@ static int rename_netif(struct udev_event *event)
- util_strscpy(ifr.ifr_name, IFNAMSIZ, udev_device_get_sysname(dev));
- util_strscpy(ifr.ifr_newname, IFNAMSIZ, event->name);
- err = ioctl(sk, SIOCSIFNAME, &ifr);
-- if (err >= 0) {
-- print_kmsg("renamed network interface %s to %s\n", ifr.ifr_name, ifr.ifr_newname);
-- } else {
-+ if (err == 0) {
-+ rename_netif_kernel_log(ifr);
+ oldname = udev_device_get_sysname(dev);
+
+ strscpy(name, IFNAMSIZ, event->name);
+
+ r = rtnl_set_link_name(&event->rtnl, udev_device_get_ifindex(dev), name);
++ if (r >= 0) {
++ log_debug("renamed network interface %s to %s\n", oldname, name);
+ goto out;
+ }
+
+ /* keep trying if the destination interface name already exists */
-+ err = -errno;
-+ if (err != -EEXIST)
++ if (r != -EEXIST)
+ goto out;
+
+ /* free our own name, another process may wait for us */
-+ snprintf(ifr.ifr_newname, IFNAMSIZ, "rename%u", udev_device_get_ifindex(dev));
-+ err = ioctl(sk, SIOCSIFNAME, &ifr);
-+ if (err < 0) {
- err = -errno;
-- log_error("error changing net interface name %s to %s: %m\n", ifr.ifr_name, ifr.ifr_newname);
-+ goto out;
-+ }
-+
++ snprintf(name, IFNAMSIZ, "rename%u", udev_device_get_ifindex(dev));
++ r = rtnl_set_link_name(&event->rtnl, udev_device_get_ifindex(dev), name);
+ if (r < 0)
+- return log_error_errno(r, "Error changing net interface name '%s' to '%s': %m", oldname, name);
++ goto out;
+
+- log_debug("renamed network interface '%s' to '%s'", oldname, name);
+ /* log temporary name */
-+ rename_netif_kernel_log(ifr);
-+
++ log_debug("renamed network interface %s to %s\n", oldname, name);
+
+- return 0;
+ /* wait a maximum of 90 seconds for our target to become available */
-+ util_strscpy(ifr.ifr_name, IFNAMSIZ, ifr.ifr_newname);
-+ util_strscpy(ifr.ifr_newname, IFNAMSIZ, event->name);
++ strscpy(name, IFNAMSIZ, event->name);
+ loop = 90 * 20;
+ while (loop--) {
+ const struct timespec duration = { 0, 1000 * 1000 * 1000 / 20 };
+
+ nanosleep(&duration, NULL);
+
-+ err = ioctl(sk, SIOCSIFNAME, &ifr);
-+ if (err == 0) {
-+ rename_netif_kernel_log(ifr);
++ r = rtnl_set_link_name(&event->rtnl, udev_device_get_ifindex(dev), name);
++ if (r >= 0) {
++ log_debug("renamed network interface %s to %s\n", oldname, name);
+ break;
+ }
-+ err = -errno;
-+ if (err != -EEXIST)
++ if (r != -EEXIST)
+ break;
- }
++ }
+
+out:
-+ if (err < 0)
-+ log_error("error changing net interface name %s to %s: %m\n", ifr.ifr_name, ifr.ifr_newname);
- close(sk);
- return err;
++ if (r < 0)
++ log_error("error changing net interface name '%s' to '%s': %s",
++ oldname, name, strerror(-r));
++ return r;
}
+
+ void udev_event_execute_rules(struct udev_event *event,
projects / packages / systemd.git / blobdiff