From 252f96967eb96ace8e52c40b8ae3d80a5e5cbecc Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Fri, 21 Oct 2022 15:43:45 +0200 Subject: [PATCH] armbian-next: cleanup logging in distro-agnostic.sh; don't use `install.log` or such --- lib/functions/rootfs/distro-agnostic.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/functions/rootfs/distro-agnostic.sh b/lib/functions/rootfs/distro-agnostic.sh index d7c4e7a690..7e261b6f5a 100644 --- a/lib/functions/rootfs/distro-agnostic.sh +++ b/lib/functions/rootfs/distro-agnostic.sh @@ -565,7 +565,7 @@ function install_distribution_agnostic() { # `systemd-networkd.service` will be enabled by `/lib/systemd/system-preset/90-systemd.preset` during first-run. # Mask it to avoid conflict - chroot "${SDCARD}" /bin/bash -c "systemctl mask systemd-networkd.service" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 + chroot_sdcard systemctl mask systemd-networkd.service # most likely we don't need to wait for nm to get online chroot_sdcard systemctl disable NetworkManager-wait-online.service @@ -587,7 +587,7 @@ function install_distribution_agnostic() { chroot_sdcard systemctl enable systemd-networkd.service systemd-resolved.service # Mask `NetworkManager.service` to avoid conflict - chroot "${SDCARD}" /bin/bash -c "systemctl mask NetworkManager.service" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 + chroot_sdcard systemctl mask NetworkManager.service if [ -e /etc/systemd/timesyncd.conf ]; then chroot_sdcard systemctl enable systemd-timesyncd.service