Skip to content

Commit 8b4f314

Browse files
committed
dietpi-config: fix flashcp call on Bullseye
In some cases, the function checks whether "-p"/"--partition" is supported, but in other cases it is used unconditionally, probably since Armbian officially dropped Bullseye support anyway.
1 parent f691157 commit 8b4f314

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

CHANGELOG.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Enhancements:
66
Bug fixes:
77
- Raspberry Pi | Resolved an issue on Debian Trixie where the LightDM did not work without enabling KMS/DRM, and hence the related dietpi-autostart option, as well as desktop autologin as non-root user. It is strictly required for recent LightDM and is hence now done automatically. Many thanks to @TheRaven500 for reporting this issue: https://github.com/MichaIng/DietPi/issues/7644#issuecomment-3221254709
88
- Rockchip SoCs | Resoved an issue where flashing the SPI bootloader could fail, since "dialog" was called if multiple U-Boot images were available, e.g. to select between M.2 NVMe and SATA support. These calls are now replaced with whiptail, which is pre-installed on DietPi.
9+
- Rockchip SoCs | Resolved an issue where flashing the SPI bootloader could fail on Bullseye systems, since flashcp was called with the "-p" flag in some cases, supported only from Bookworm on. Many thanks to @Arkem for reporting this issue: https://dietpi.com/forum/t/23426/46
910
- DietPi-Config | Resolved a v9.13 regression where setting CPU frequency limits was not possible. This has been solved for DietPi v9.16 as well via live patch. Many thanks to @gitlankford for reporting this issue: https://github.com/MichaIng/DietPi/issues/7696
1011
- DietPi-Software | Portainer: Resolved a v9.16 regression where the installation could not manage the local Docker environment since the Docker socket was mounted to a wrong path. This has been solved for DietPi v9.16 as well via live patch. Many thanks to @pappv-dd for reporting this issue: https://github.com/MichaIng/DietPi/issues/7691
1112

dietpi/dietpi-config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,6 +1133,8 @@ Further information: https://www.raspberrypi.org/documentation/hardware/raspberr
11331133
# shellcheck disable=SC1091
11341134
. /usr/lib/u-boot/platform_install.sh
11351135
eval "$(declare -f write_uboot_platform_mtd | sed -e 's| > /dev/null 2>&1||g' -e 's|status=none|status=progress|g' -e 's/dd /dd oflag=direct conv=notrunc status=progress /' -e 's/exit/return/' -e 's/dialog --no-collapse/whiptail/')"
1136+
# Bullseye: Remove flashcp "-p" flag
1137+
(( $G_DISTRO < 7 )) && eval "$(declare -f write_uboot_platform_mtd | sed 's/flashcp -v -p/flashcp -v/')"
11361138
# shellcheck disable=SC2154
11371139
write_uboot_platform_mtd "$DIR" "$spidev"
11381140

0 commit comments

Comments
 (0)