From 9aad8db62cde9efceb4ce16559a6b60ec853a554 Mon Sep 17 00:00:00 2001 From: Daniel Knight Date: Thu, 8 Nov 2018 19:51:26 +0000 Subject: [PATCH] v6.18 - General | NanoPi Fire3: Resolved an issue with blank HDMI output. Device is now switched to tty2 during boot, as a workaround/fix due to tty1 failing: https://github.com/Fourdee/DietPi/issues/2225 --- CHANGELOG.txt | 1 + dietpi/boot | 12 +++++++++++- dietpi/patch_file | 12 ++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index fdf0d78fba..7334ef9b46 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -12,6 +12,7 @@ Changes / Improvements / Optimisations: Bug Fixes: - PREP: Resolved failed rootFS resize: https://github.com/Fourdee/DietPi/issues/2181#issuecomment-433715556 + - General | NanoPi Fire3: Resolved an issue with blank HDMI output. Device is now switched to tty2 during boot, as a workaround/fix due to tty1 failing: https://github.com/Fourdee/DietPi/issues/2225 - DietPi-Config | Locale: Resolved an issue where DietPi would always display en_GB as the current locale: https://github.com/Fourdee/DietPi/issues/2216#issuecomment-435599419 - DietPi-Automation | CONFIG_NTP_MODE is now applied after APT cache, and, initial time sync is updated. Due to packages required for some modes: https://github.com/Fourdee/DietPi/issues/2181#issuecomment-433444882 - DietPi-Software | Roon Bridge: Resolved an issue where the remote update would fail due to underpriv permissions: https://community.roonlabs.com/t/dietpi-allo-units-not-getting-the-roonbridge-b167-update-from-b164/52503/6 diff --git a/dietpi/boot b/dietpi/boot index 2476794332..89bab3316a 100644 --- a/dietpi/boot +++ b/dietpi/boot @@ -26,7 +26,17 @@ Apply_DietPi_FirstRun_Settings(){ #---------------------------------------------------------------- - echo 0 > /dev/null + #Workarounds + # - Workaround for NanoPi Fire3 with tty1 disabled: https://github.com/Fourdee/DietPi/issues/2225 + if (( $G_HW_MODEL == 62 )) && dmesg | grep -qi 'NanoPi Fire3'; then + + chvt 2 + cat << _EOF_ > /var/lib/dietpi/postboot.d/fire3_tty2 +#!/bin/bash +chvt 2 +_EOF_ + + fi #---------------------------------------------------------------- } diff --git a/dietpi/patch_file b/dietpi/patch_file index d08857aba1..e9b4f858b5 100644 --- a/dietpi/patch_file +++ b/dietpi/patch_file @@ -1272,6 +1272,18 @@ _EOF_ elif (( $G_DIETPI_VERSION_SUB == 17 )); then + #------------------------------------------------------------------------------- + #Workarounds + # - Workaround for NanoPi Fire3 with tty1 disabled: https://github.com/Fourdee/DietPi/issues/2225 + if (( $G_HW_MODEL == 62 )) && dmesg | grep -qi 'NanoPi Fire3'; then + + chvt 2 + cat << _EOF_ > /var/lib/dietpi/postboot.d/fire3_tty2 +#!/bin/bash +chvt 2 +_EOF_ + + fi #------------------------------------------------------------------------------- #Reinstalls: # OMPD: https://github.com/Fourdee/DietPi/issues/2156#issue-372201367