forked from pool/systemd
bbba62be60
- Add or port upstream bugfix patches: 0001-Fix-systemd-stdio-bridge-symlink.patch 0002-execute-free-directory-path-if-we-fail-to-remove-it-.patch 0003-Do-not-print-invalid-UTF-8-in-error-messages.patch 0004-man-document-missing-options-of-systemd-run.patch 0005-systemd-run-add-some-extra-safety-checks.patch 0006-journal-assume-that-next-entry-is-after-previous-ent.patch 0007-journal-forget-file-after-encountering-an-error.patch 0008-core-correctly-unregister-PIDs-from-PID-hashtables.patch 0009-logind-fix-reference-to-systemd-user-sessions.servic.patch 0010-man-update-link-to-LSB.patch 0011-man-systemd-bootchart-fix-spacing-in-command.patch 0012-man-add-missing-comma.patch 0013-units-Do-not-unescape-instance-name-in-systemd-backl.patch - Add linker scripts as place holder of the old systemd shared libraries now all included in libsystemd.so (bnc#867128) - Make patch 1006-udev-always-rename-network.patch work again and add it again. - address missing owner functionality in systemd-tmpfiles (fate#314974) 1022-systemd-tmpfiles-ownerkeep.patch - Generate the bash completion files on the fly for the case of not having the package bash-completion around - Add or port upstream bugfix patches: 0001-nspawn-fix-detection-of-missing-proc-self-loginuid.patch 0002-cdrom_id-use-the-old-MMC-fallback.patch 0003-journalctl-refuse-extra-arguments-with-verify-and-si.patch OBS-URL: https://build.opensuse.org/request/show/225408 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=177
64 lines
2.6 KiB
Diff
64 lines
2.6 KiB
Diff
From: Robert Milasan <rmilasan@suse.com>
|
|
Cc: Werner Fink <werner@suse.de>
|
|
Subject: udev always rename network
|
|
|
|
Date: Thu, 28 Mar 2013 09:24:43 +0000
|
|
udev: ensure that the network interfaces are renamed even if they exist (bnc#809843).
|
|
|
|
Date: Tue, 4 Mar 2014 10:29:21 +0000
|
|
Port the patch of Robert to systemd v210 and test it out.
|
|
|
|
---
|
|
udev-event.c | 40 ++++++++++++++++++++++++++++++++++++----
|
|
1 file changed, 36 insertions(+), 4 deletions(-)
|
|
|
|
--- systemd-210/src/udev/udev-event.c
|
|
+++ systemd-210/src/udev/udev-event.c 2014-03-04 11:19:50.583710411 +0100
|
|
@@ -765,10 +765,42 @@ static int rename_netif(struct udev_even
|
|
return r;
|
|
|
|
r = rtnl_set_link_name(rtnl, udev_device_get_ifindex(dev), name);
|
|
- if (r < 0)
|
|
- log_error("error changing net interface name %s to %s: %s",
|
|
- oldname, name, strerror(-r));
|
|
- else
|
|
+ if (r < 0) {
|
|
+ char interim[IFNAMSIZ], *ptr = &interim[0];
|
|
+ int loop = 90;
|
|
+
|
|
+ /* keep trying if the destination interface name already exists */
|
|
+ if (r != -EEXIST) {
|
|
+ log_error("error changing net interface name %s to %s: %s",
|
|
+ oldname, name, strerror(-r));
|
|
+ return r;
|
|
+ }
|
|
+
|
|
+ /* free our own name, another process may wait for us */
|
|
+ strpcpyf(&ptr, IFNAMSIZ, "rename%u", udev_device_get_ifindex(dev));
|
|
+
|
|
+ r = rtnl_set_link_name(rtnl, udev_device_get_ifindex(dev), interim);
|
|
+ if (r < 0) {
|
|
+ log_error("error changing net interface name %s to %s: %s",
|
|
+ oldname, name, strerror(-r));
|
|
+ return r;
|
|
+ }
|
|
+
|
|
+ /* log temporary name */
|
|
+ print_kmsg("renamed network interface %s to %s", oldname, interim);
|
|
+ do {
|
|
+ r = rtnl_set_link_name(rtnl, udev_device_get_ifindex(dev), name);
|
|
+ if (r == 0) {
|
|
+ print_kmsg("renamed network interface %s to %s", oldname, name);
|
|
+ return r;
|
|
+ }
|
|
+ if (r != -EEXIST) {
|
|
+ log_error("error changing net interface name %s to %s: %s",
|
|
+ oldname, name, strerror(-r));
|
|
+ return r;
|
|
+ }
|
|
+ } while (loop-- > 0);
|
|
+ } else
|
|
print_kmsg("renamed network interface %s to %s", oldname, name);
|
|
|
|
return r;
|