MT#55944 Use ngcp-initialize-udev-rules-net to deploy 70-persistent-net.rules

Use system-tools' ngcp-initialize-udev-rules-net script to
deploy the /etc/udev/rules.d/70-persistent-net.rules, no need
to maintain code at multiple places.

Change-Id: I81925262a8c687aa9976cbc1113568989fa53281
mr11.2.1
Michael Prokop 4 years ago
parent ae7db13232
commit e6819fe674

@ -1318,39 +1318,6 @@ set_custom_grub_boot_options() {
}
generate_udev_network_rules() {
# get list of available network devices
# (excl. some known-to-be-irrelevant ones, also see MT#8297)
NETWORK_DEVICES="$(tail -n +3 /proc/net/dev | sed -r 's/^ *([0-9a-zA-Z]+):.*$/\1/g' | \
grep -ve '^vmnet' -ve '^vboxnet' -ve '^docker' -ve '^usb' -ve '^vlan' -ve '^bond' | sort -u)"
echo "Generating udev persistent net rules."
TARGET_UDEV_PERSISTENT_NET_RULES="${TARGET}/etc/udev/rules.d/70-persistent-net.rules"
echo "## Generated by Sipwise deployment script" > "${TARGET_UDEV_PERSISTENT_NET_RULES}"
for dev in ${NETWORK_DEVICES}; do
[[ "${dev}" =~ ^lo ]] && continue
pciid=$(ethtool -i "${dev}" | awk '/^bus-info: / {print $2}')
if [[ "${pciid}" =~ ^([0-9a-fA-F:.-])+$ ]]; then
dev_name_new="n${dev}"
echo "Adding device '${dev}' with PCIID '${pciid}', dev_name_new=${dev_name_new}"
cat >> "${TARGET_UDEV_PERSISTENT_NET_RULES}" <<EOL
SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", KERNELS=="${pciid}", NAME="${dev_name_new}"
EOL
else
echo "WARNING: could not find valid PCIID '${pciid}' for device '${dev}'"
fi
unset pciid
done
echo "Content of resulting /etc/udev/rules.d/70-persistent-net.rules:"
cat "${TARGET_UDEV_PERSISTENT_NET_RULES}"
# Rename existing network devices at this time, to use the new names "neth*"
# when creating config_deploy.inc later
NETWORK_DEVICES="${NETWORK_DEVICES//eth/neth}"
}
# Main script
INSTALL_LOG='/tmp/deployment-installer-debug.log'
@ -2223,8 +2190,6 @@ fi
if "$NGCP_INSTALLER" ; then
set_deploy_status "ngcp-installer"
generate_udev_network_rules
echo "Searching for proper ngcp-installer package ..."
get_installer_path
@ -2301,6 +2266,9 @@ EOT
die "Error during installation of ngcp. Find details at: ${TARGET}/var/log/ngcp-installer.log"
fi
echo "Generating udev persistent net rules ..."
grml-chroot "${TARGET}" /usr/sbin/ngcp-initialize-udev-rules-net
echo "Temporary files cleanup ..."
find "${TARGET}/var/log" -type f -size +0 -not -name \*.ini -not -name ngcp-installer.log -exec sh -c ":> \${1}" sh {} \;
:>$TARGET/run/utmp

Loading…
Cancel
Save