JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

networking: exts: introduce sanity checks, debug info

Browse Source 
- protect against enabling networking exts directly
- debug logging
- fix typo in ext name
This commit is contained in:
Ricardo Pardini
2024-06-23 09:02:09 +02:00
committed by Igor
parent 22b894536e
commit 71d5e192c6
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,11 @@
# Extension to manage network interfaces with NetworkManager + Netplan
#
function extension_prepare_config__install_network_manager() {
# Sanity check
if [[ "${NETWORKING_STACK}" != "network-manager" ]]; then
exit_with_error "Extension: ${EXTENSION}: requires NETWORKING_STACK='network-manager', currently set to '${NETWORKING_STACK}'"
fi
display_alert "Extension: ${EXTENSION}: Installing additional packages" "network-manager network-manager-openvpn netplan.io" "info"
add_packages_to_image network-manager network-manager-openvpn netplan.io
@@ -39,9 +44,9 @@ function pre_install_kernel_debs__configure_network_manager() {
local network_manager_config_src_folder="${EXTENSION_DIR}/config-nm/NetworkManager/"
local network_manager_config_dst_folder="${SDCARD}/etc/NetworkManager/conf.d/"
run_host_command_logged cp "${netplan_config_src_folder}"* "${netplan_config_dst_folder}"
run_host_command_logged cp "${network_manager_config_src_folder}"* "${network_manager_config_dst_folder}"
run_host_command_logged cp -v "${netplan_config_src_folder}"* "${netplan_config_dst_folder}"
run_host_command_logged cp -v "${network_manager_config_src_folder}"* "${network_manager_config_dst_folder}"
# Change the file permissions according to https://netplan.readthedocs.io/en/stable/security/
chmod 600 "${SDCARD}"/etc/netplan/*
chmod -v 600 "${SDCARD}"/etc/netplan/*
}

11
extensions/network/net-systemd-neworkd.sh → extensions/network/net-systemd-networkd.sh
View File

@@ -2,6 +2,11 @@
# Extension to manage network interfaces with systemd-networkd + Netplan
#
function extension_prepare_config__install_systemd_networkd() {
# Sanity check
if [[ "${NETWORKING_STACK}" != "systemd-networkd" ]]; then
exit_with_error "Extension: ${EXTENSION}: requires NETWORKING_STACK='systemd-networkd', currently set to '${NETWORKING_STACK}'"
fi
display_alert "Extension: ${EXTENSION}: Installing additional packages" "netplan.io" "info"
add_packages_to_image netplan.io
}
@@ -22,9 +27,9 @@ function pre_install_kernel_debs__configure_systemd_networkd() {
local networkd_config_src_folder="${EXTENSION_DIR}/config-networkd/systemd/network/"
local networkd_config_dst_folder="${SDCARD}/etc/systemd/network/"
run_host_command_logged cp "${netplan_config_src_folder}"* "${netplan_config_dst_folder}"
run_host_command_logged cp "${networkd_config_src_folder}"* "${networkd_config_dst_folder}"
run_host_command_logged cp -v "${netplan_config_src_folder}"* "${netplan_config_dst_folder}"
run_host_command_logged cp -v "${networkd_config_src_folder}"* "${networkd_config_dst_folder}"
# Change the file permissions according to https://netplan.readthedocs.io/en/stable/security/
chmod 600 "${SDCARD}"/etc/netplan/*
chmod -v 600 "${SDCARD}"/etc/netplan/*
}