From af3270a804fede0b75644a2985bdebd517e50c27 Mon Sep 17 00:00:00 2001 From: MichaIng Date: Tue, 4 May 2021 15:28:47 +0200 Subject: [PATCH] v7.2 + DietPi-Patches | Do not attempt to remove foreign armhf architecture from 64-bit RPi images, if any armhf package is still installed, as this does then fail: https://github.com/MichaIng/DietPi/issues/4338 --- .update/patches | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.update/patches b/.update/patches index 4bbfc846c1..2abcb2b98b 100644 --- a/.update/patches +++ b/.update/patches @@ -82,7 +82,7 @@ fi rm -f /mnt/dietpi_userdata/{{sonarr,radarr}/nzbdrone.db-{shm,wal},lidarr/lidarr.db-{shm,wal}}.bak # v7.1: On 64-bit RPi systems, remove the obsolete foreign architecture armhf -[[ $G_HW_MODEL -le 9 && $G_HW_ARCH == 3 && $(dpkg --print-architecture) == 'arm64' ]] && G_EXEC dpkg --remove-architecture 'armhf' +[[ $G_HW_MODEL -le 9 && $G_HW_ARCH == 3 && $(dpkg --print-architecture) == 'arm64' ]] && ! dpkg-query -l '*:armhf' &> /dev/null && G_EXEC dpkg --remove-architecture 'armhf' # v7.1: Plex Media Server: Fix secure remote access via app.plex.tv did not work if Unbound with DNS rebinding protection is installed: https://dietpi.com/phpbb/viewtopic.php?t=8896 [[ -f '/boot/dietpi/.installed' ]] && grep -q '^[[:blank:]]*aSOFTWARE_INSTALL_STATE\[42\]=2' /boot/dietpi/.installed && grep -q '^[[:blank:]]*aSOFTWARE_INSTALL_STATE\[182\]=2' /boot/dietpi/.installed && echo -e 'server:\n\tprivate-domain: "plex.direct"' > /etc/unbound/unbound.conf.d/dietpi-plex.conf