Drop the interface renaming disabling hack

- it won't work with current systemd, as the udev rules file name
  changed. The /dev/null symlink does nothing now.
- the interface won't be renamed when systemd-network is not installed
- PLD really should not force its ways for historical reasons. eth*
  unpredictability is a real problem on systems with more than one
  interface.

Predictable interface names will be used when systemd-networkd is
installed, unless its configuration states otherwise.

Without systemd-networkd installed eth* hell stays.

diff --git a/systemd.spec b/systemd.spec
index 3d6ea0ff8e3627f4be9b919ade1a340ffbeca7b6..ea71f0963b5faf04e09404133b40eb0f3f0d19e1 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -740,10 +740,6 @@ ln -s /lib/udev $RPM_BUILD_ROOT/usr/lib/
 cp -a %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/40-alsa-restore.rules
 cp -a %{SOURCE102} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/70-udev-pld.rules
 
-# disable this abomination
-# http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames
-ln -s /dev/null $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/80-net-name-slot.rules
-
 # install udev configs
 cp -a %{SOURCE103} $RPM_BUILD_ROOT%{_sysconfdir}/udev/links.conf
 
@@ -1942,7 +1938,6 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/links.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/40-alsa-restore.rules
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/70-udev-pld.rules
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/80-net-name-slot.rules
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/udev.conf