enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: Remove NM_IGNORE_DEVICES variable

Browse Source 
This variable was originally introduces for the board "Espressobin" (mvebu64): 38db0b55f9
Use a hook in the mvebu64 and mt7623 family config to set ignored devices for NetworkManager instead.
This commit is contained in:
ColorfulRhino 2024-06-19 14:49:27 +02:00 committed by Igor
parent a8a55ddbf2
commit d1c6fa6e76
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/sources/families/mt7623.conf
View File

@ -30,7 +30,16 @@ CPUMIN=98000
CPUMAX=1300000
GOVERNOR="ondemand"
NM_IGNORE_DEVICES="interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*"
function pre_install_kernel_debs__network_manager_ignore_devices() {
display_alert "Board: ${BOARD}: Disabling Network-Manager for all devices" "interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*" "info"
mkdir -p "${SDCARD}"/etc/NetworkManager/conf.d/
cat <<- EOF > "${SDCARD}"/etc/NetworkManager/conf.d/99-ignore-interfaces.conf
[keyfile]
unmanaged-devices="interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*"
EOF
}
write_uboot_platform() {
if [[ $2 == /dev/mmcblk* && -b ${2}boot0 ]]; then

11
config/sources/families/mvebu64.conf
View File

@ -72,7 +72,16 @@ CPUMIN=200000
CPUMAX=1300000
GOVERNOR=ondemand
NM_IGNORE_DEVICES="interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*"
function pre_install_kernel_debs__network_manager_ignore_devices() {
display_alert "Board: ${BOARD}: Disabling Network-Manager for all devices" "interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*" "info"
mkdir -p "${SDCARD}"/etc/NetworkManager/conf.d/
cat <<- EOF > "${SDCARD}"/etc/NetworkManager/conf.d/99-ignore-interfaces.conf
[keyfile]
unmanaged-devices="interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*"
EOF
}
write_uboot_platform() {
if [[ $BOARD = macchiatobin-doubleshot ]]; then

11
extensions/network/net-network-manager.sh
View File

@ -16,8 +16,7 @@ function add_host_dependencies__install_network_manager() {
fi
}
function pre_install_kernel_debs__configure_network_manager()
{
function pre_install_kernel_debs__configure_network_manager() {
display_alert "Extension: ${EXTENSION}: Enabling Network-Manager" "" "info"
# We can't disable/mask systemd-networkd.service since it is required by Netplan
@ -25,14 +24,6 @@ function pre_install_kernel_debs__configure_network_manager()
# Most likely we don't need to wait for nm to get online
chroot_sdcard systemctl disable NetworkManager-wait-online.service
if [[ -n $NM_IGNORE_DEVICES ]]; then
mkdir -p "${SDCARD}"/etc/NetworkManager/conf.d/
cat <<- EOF > "${SDCARD}"/etc/NetworkManager/conf.d/10-ignore-interfaces.conf
[keyfile]
unmanaged-devices=$NM_IGNORE_DEVICES
EOF
fi
# Copy network config files into the appropriate folders
display_alert "Configuring" "NetworkManager and Netplan" "info"
local netplan_config_src_folder="${EXTENSION_DIR}/config-nm/netplan/"