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

Move netplan renderer selection to distro common selection (#5971)

Browse Source
This commit is contained in:
Igor
2023-11-26 23:18:40 +01:00
committed by GitHub
parent 004d5190ef
commit 1f1d77cff3
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/functions/rootfs/distro-specific.sh
View File

@@ -24,11 +24,6 @@ function install_distribution_specific() {
run_host_command_logged rm -f "${SDCARD}"/etc/update-motd.d/{10-uname,10-help-text,50-motd-news,80-esm,80-livepatch,90-updates-available,91-release-upgrade,95-hwe-eol} run_host_command_logged rm -f "${SDCARD}"/etc/update-motd.d/{10-uname,10-help-text,50-motd-news,80-esm,80-livepatch,90-updates-available,91-release-upgrade,95-hwe-eol}
declare RENDERER=networkd
if [ -d "${SDCARD}"/etc/NetworkManager ]; then
local RENDERER=NetworkManager
fi
# DNS fix # DNS fix
if [[ -n "$NAMESERVER" ]]; then if [[ -n "$NAMESERVER" ]]; then
if [[ -f "${SDCARD}"/etc/systemd/resolved.conf ]]; then if [[ -f "${SDCARD}"/etc/systemd/resolved.conf ]]; then
@@ -63,11 +58,19 @@ function install_distribution_specific() {
fi fi
# Basic Netplan config. Let NetworkManager/networkd manage all devices on this system # Basic Netplan config. Let NetworkManager/networkd manage all devices on this system
[[ -d "${SDCARD}"/etc/netplan ]] && cat <<- EOF > "${SDCARD}"/etc/netplan/armbian-default.yaml if [[ -d "${SDCARD}"/etc/netplan ]]; then
declare RENDERER=networkd
if [ -d "${SDCARD}"/etc/NetworkManager ]; then
local RENDERER=NetworkManager
fi
cat <<- EOF > "${SDCARD}"/etc/netplan/armbian-default.yaml
network: network:
version: 2 version: 2
renderer: ${RENDERER} renderer: ${RENDERER}
EOF EOF
fi
# cleanup motd services and related files # cleanup motd services and related files
disable_systemd_service_sdcard motd-news.service motd-news.timer disable_systemd_service_sdcard motd-news.service motd-news.timer