Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DietPi-Installer | Remove pre-v8.14 workarounds #6152

Merged
merged 1 commit into from
Feb 11, 2023
Merged

DietPi-Installer | Remove pre-v8.14 workarounds #6152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .build/images/dietpi-installer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,6 @@ _EOF_
# Odroid N2/HC4: Enable USB boot via petitboot support:https://github.com/MichaIng/DietPi/issues/5634
elif [[ $G_HW_MODEL =~ ^15|16$ ]]
then
G_EXEC curl -sSf 'https://raw.githubusercontent.com/MichaIng/DietPi/dev/.build/images/U-Boot/boot.cmd' -o /boot/boot.cmd # Workaround until v8.14 has been merged
G_EXEC sed -i '1i[main]' /boot/dietpiEnv.txt
# shellcheck disable=SC2016
(( $G_HW_MODEL == 15 )) && G_EXEC sed -i '/^setenv overlay_error/a\
Expand Down Expand Up @@ -1751,7 +1750,6 @@ _EOF_'
then
/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttySAC0
/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttyGS0
[[ -f '/boot/dietpiEnv.txt' ]] && G_EXEC sed -i '/^consoleargs=/s/ console=ttyGS0$//' /boot/dietpiEnv.txt # Workaround until v8.14 has been merged

# ROCKPro64, ROCK64, Pinebook Pro, NanoPi R4S, Quartz64, ASUS Tinker Board, NanoPi R2S, NanoPi NEO3, NanoPi M4V2, NanoPi M4/T4/NEO4, ROCK Pi 4, ROCK 3A, ROCK 5B
elif [[ $G_HW_MODEL =~ ^(42|43|46|47|49|52|55|56|58|68|72|77|78|80)$ ]]
Expand Down