|
 |
a56a5e |
From 0506080aee1da03e867b1ab3f182d19bfbeae443 Mon Sep 17 00:00:00 2001
|
|
|
83bbb1 |
From: Harald Hoyer <harald@redhat.com>
|
|
|
83bbb1 |
Date: Fri, 4 Apr 2014 12:52:39 +0200
|
|
|
83bbb1 |
Subject: [PATCH] ifcfg: only bind to HWADDR, if addr_assign_type == 0
|
|
|
83bbb1 |
|
|
|
83bbb1 |
/sys/class/net/$netif/addr_assign_type is != 0 for random MAC address
|
|
|
83bbb1 |
interfaces
|
|
|
83bbb1 |
|
|
|
83bbb1 |
(cherry picked from commit 2e094b20a6875fdb0a7ef8772e3d7688ad91c036)
|
|
|
83bbb1 |
---
|
|
|
83bbb1 |
modules.d/40network/net-lib.sh | 3 ---
|
|
|
83bbb1 |
modules.d/45ifcfg/write-ifcfg.sh | 2 ++
|
|
|
83bbb1 |
2 files changed, 2 insertions(+), 3 deletions(-)
|
|
|
83bbb1 |
|
|
|
83bbb1 |
diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
|
|
|
1755ca |
index 5d4ae32c..d53e1a6e 100755
|
|
|
83bbb1 |
--- a/modules.d/40network/net-lib.sh
|
|
|
83bbb1 |
+++ b/modules.d/40network/net-lib.sh
|
|
|
83bbb1 |
@@ -518,9 +518,6 @@ find_iface_with_link() {
|
|
|
83bbb1 |
}
|
|
|
83bbb1 |
|
|
|
83bbb1 |
is_persistent_ethernet_name() {
|
|
|
83bbb1 |
- [ -f /sys/class/net/$netif/addr_assign_type ] || return 1
|
|
|
83bbb1 |
- [ "$(cat /sys/class/net/$netif/addr_assign_type)" = "0" ] || return 1
|
|
|
83bbb1 |
-
|
|
|
83bbb1 |
case "$1" in
|
|
|
83bbb1 |
# udev persistent interface names
|
|
|
83bbb1 |
eth[0-9]|eth[0-9][0-9]|eth[0-9][0-9][0-9]*)
|
|
|
83bbb1 |
diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
|
|
|
1755ca |
index 2631fbe2..5dc351d5 100755
|
|
|
83bbb1 |
--- a/modules.d/45ifcfg/write-ifcfg.sh
|
|
|
83bbb1 |
+++ b/modules.d/45ifcfg/write-ifcfg.sh
|
|
|
83bbb1 |
@@ -166,6 +166,8 @@ for netup in /tmp/net.*.did-setup ; do
|
|
|
83bbb1 |
if ! print_s390 $netif; then
|
|
|
83bbb1 |
if [ -z "$macaddr" ] && \
|
|
|
83bbb1 |
! is_persistent_ethernet_name "$netif" && \
|
|
|
83bbb1 |
+ [ -f /sys/class/net/$netif/addr_assign_type ] && \
|
|
|
83bbb1 |
+ [ "$(cat /sys/class/net/$netif/addr_assign_type)" = "0" ] && \
|
|
|
83bbb1 |
[ -f /sys/class/net/$netif/address ]; then
|
|
|
83bbb1 |
echo "HWADDR=\"$(cat /sys/class/net/$netif/address)\""
|
|
|
83bbb1 |
fi
|