iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update to 31b795ca71189b326b80666076398f31aea4f2be
[automated-distro-installer]
/
fai
/
config
/
scripts
/
DEBIAN
/
30-interface
diff --git
a/fai/config/scripts/DEBIAN/30-interface
b/fai/config/scripts/DEBIAN/30-interface
index 34c98e81aa5591b790912bf64a26b1dd84d4f625..bff686311d72b98a913735734c6ecb52fc49f4e8 100755
(executable)
--- a/
fai/config/scripts/DEBIAN/30-interface
+++ b/
fai/config/scripts/DEBIAN/30-interface
@@
-49,6
+49,7
@@
iface_stanza() {
newnicnames() {
# determine predictable network names only for stretch and above
newnicnames() {
# determine predictable network names only for stretch and above
+ local name
[ $do_init_tasks -eq 0 ] && return
[ -z "$NIC1" ] && return
[ $do_init_tasks -eq 0 ] && return
[ -z "$NIC1" ] && return
@@
-63,10
+64,16
@@
newnicnames() {
name=$(udevadm info /sys/class/net/$NIC1 | sed -rn "s/^E: $field=(.+)/\1/p")
if [[ $name ]]; then
NIC1=$name
name=$(udevadm info /sys/class/net/$NIC1 | sed -rn "s/^E: $field=(.+)/\1/p")
if [[ $name ]]; then
NIC1=$name
- break
+ return
fi
done
fi
done
- if [[ ! $name ]]; then
+
+ # try to get altname net dev
+ name=$(ip link show $NIC1 | awk '/altname / { print $2 }')
+ if [[ $name ]]; then
+ NIC1=$name
+ return
+ else
echo "$0: error: could not find systemd predictable network name. Using $NIC1."
fi
}
echo "$0: error: could not find systemd predictable network name. Using $NIC1."
fi
}