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

armbian-next: only put systemd-resolved's symlink in place if _not_ using NetworkManager

Browse Source 
- why is it even installed? dunno, but fix anyway.
This commit is contained in:
Ricardo Pardini 2023-01-03 18:58:49 +01:00
parent f8b141cdf0
commit 59031be6b3
No known key found for this signature in database
GPG Key ID: 3D38CA12A66C5D02
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/functions/rootfs/distro-agnostic.sh
View File

@ -546,7 +546,7 @@ function install_distribution_agnostic() {
# enable PubkeyAuthentication
sed -i 's/#\?PubkeyAuthentication .*/PubkeyAuthentication yes/' "${SDCARD}"/etc/ssh/sshd_config
if [ -f "${SDCARD}"/etc/NetworkManager/NetworkManager.conf ]; then
if [[ -f "${SDCARD}"/etc/NetworkManager/NetworkManager.conf ]]; then
# configure network manager
sed "s/managed=\(.*\)/managed=true/g" -i "${SDCARD}"/etc/NetworkManager/NetworkManager.conf

13
lib/functions/rootfs/post-tweaks.sh
View File

@ -3,12 +3,13 @@
function post_debootstrap_tweaks() {
display_alert "Applying post-tweaks" "post_debootstrap_tweaks" "debug"
# activate systemd-resolved
if [[ -d "${SDCARD}"/etc/systemd/network ]]; then
display_alert "Activating systemd-resolved" "Symlink resolv.conf" "debug"
# configure networkd
run_host_command_logged rm -fv "${SDCARD}"/etc/resolv.conf
run_host_command_logged ln -s /run/systemd/resolve/resolv.conf "${SDCARD}"/etc/resolv.conf
# activate systemd-resolved, if not using NetworkManager
if [[ ! -f "${SDCARD}"/etc/NetworkManager/NetworkManager.conf ]]; then
if [[ -d "${SDCARD}"/etc/systemd/network ]]; then
display_alert "Activating systemd-resolved" "Symlink resolv.conf to systemd-resolved's" "debug"
run_host_command_logged rm -fv "${SDCARD}"/etc/resolv.conf
run_host_command_logged ln -s /run/systemd/resolve/resolv.conf "${SDCARD}"/etc/resolv.conf
fi
fi
# remove service start blockers