v8.24

- META | Merge from master
MichaIng · Nov 17, 2023 · 1cb7672 · 1cb7672
2 parents cdc1b72 + ab75b1b
commit 1cb7672
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/.update/pre-patches b/.update/pre-patches
@@ -332,6 +332,13 @@ then
 	fi
 	# Workaround for Beta v8.23.1 users as previous gpg method installed a 0600 file
 	[[ -f '/etc/apt/trusted.gpg.d/dietpi-sonarr.gpg' ]] && G_EXEC chmod 0644 /etc/apt/trusted.gpg.d/dietpi-sonarr.gpg
+
+	# Backport: https://github.com/MichaIng/DietPi/issues/6747
+	if (( $G_HW_MODEL == 4 && $G_DISTRO > 6 )) && dpkg-query -s rpi-eeprom &> /dev/null
+	then
+		G_DIETPI-NOTIFY 2 'Setting rpi-eeprom package on hold to prevent conflicting upgrade attempt'
+		G_EXEC apt-mark hold rpi-eeprom
+	fi
 fi
 
 # v8.24