- prefer slot->path->onboard order for network interface naming

diff --git a/udev-net.ifnames.patch b/udev-net.ifnames.patch
index 35c35d6a91d8ff77baaaf9323f46e799892491c3..16bfc2ee108d5f934fd7e6a041c379ea1280c8de 100644 (file)
--- a/udev-net.ifnames.patch
+++ b/udev-net.ifnames.patch
@@ -1,12 +1,16 @@
-diff -ur eudev-3.2.12.orig/rules/80-net-name-slot.rules eudev-3.2.12/rules/80-net-name-slot.rules
---- eudev-3.2.12.orig/rules/80-net-name-slot.rules     2023-07-18 15:43:45.132509561 +0200
-+++ eudev-3.2.12/rules/80-net-name-slot.rules  2023-07-18 15:44:00.123730954 +0200
-@@ -5,7 +5,7 @@
+diff -ur eudev-3.2.14.orig/rules/80-net-name-slot.rules eudev-3.2.14/rules/80-net-name-slot.rules
+--- eudev-3.2.14.orig/rules/80-net-name-slot.rules     2021-08-20 19:28:40.000000000 +0200
++++ eudev-3.2.14/rules/80-net-name-slot.rules  2024-07-08 17:59:01.085829378 +0200
+@@ -5,10 +5,10 @@

  NAME!="", GOTO="net_name_slot_end"
  
  IMPORT{cmdline}="net.ifnames"
 -ENV{net.ifnames}=="0", GOTO="net_name_slot_end"
 +ENV{net.ifnames}!="1", GOTO="net_name_slot_end"
  
  NAME!="", GOTO="net_name_slot_end"
  
  IMPORT{cmdline}="net.ifnames"
 -ENV{net.ifnames}=="0", GOTO="net_name_slot_end"
 +ENV{net.ifnames}!="1", GOTO="net_name_slot_end"
  

- NAME=="", ENV{ID_NET_NAME_ONBOARD}!="", NAME="$env{ID_NET_NAME_ONBOARD}"
+-NAME=="", ENV{ID_NET_NAME_ONBOARD}!="", NAME="$env{ID_NET_NAME_ONBOARD}"

  NAME=="", ENV{ID_NET_NAME_SLOT}!="", NAME="$env{ID_NET_NAME_SLOT}"
  NAME=="", ENV{ID_NET_NAME_SLOT}!="", NAME="$env{ID_NET_NAME_SLOT}"

+ NAME=="", ENV{ID_NET_NAME_PATH}!="", NAME="$env{ID_NET_NAME_PATH}"
++NAME=="", ENV{ID_NET_NAME_ONBOARD}!="", NAME="$env{ID_NET_NAME_ONBOARD}"
+ 
+ LABEL="net_name_slot_end"

diff --git a/udev.spec b/udev.spec
index d0fd803e41658978b3dd5f74d74ffb4a238406df..fb149d6283647b028d6f2aa82252e2c01729ad6f 100644 (file)
--- a/udev.spec
+++ b/udev.spec
@@ -6,7 +6,7 @@ Summary:        Device manager for the Linux kernel
 Summary(pl.UTF-8):     Zarządca urządzeń dla jądra Linuksa
 Name:          udev
 Version:       3.2.14
 Summary(pl.UTF-8):     Zarządca urządzeń dla jądra Linuksa
 Name:          udev
 Version:       3.2.14

-Release:       1
+Release:       2

 Epoch:         2
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
 Epoch:         2
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base