From f6a6fd2f4d55f028444d91445558eb3fe18fa17a Mon Sep 17 00:00:00 2001 From: MichaIng Date: Mon, 8 Jul 2024 00:34:13 +0200 Subject: [PATCH] v9.6 - DietPi-Installer | Remove pre-v9.6 steps --- .build/images/dietpi-installer | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.build/images/dietpi-installer b/.build/images/dietpi-installer index c2fd0f14d5..ff082f29a8 100755 --- a/.build/images/dietpi-installer +++ b/.build/images/dietpi-installer @@ -814,8 +814,6 @@ setenv rootuuid "true"' /boot/boot.cmd G_DIETPI-NOTIFY 2 'Applying DietPi live patches to fix known bugs in this version' for i in "${!G_LIVE_PATCH[@]}" do - # ToDo: Temporarily skip live patch 0 on NanoPi R6C, which cannot succeed here, but will be applied later in this script - (( $G_HW_MODEL == 79 && $HW_VARIANT == 2 && $i == 0 )) && [[ ${G_LIVE_PATCH_DESC[i]} == *'NanoPi R6C' ]] && continue if eval "${G_LIVE_PATCH_COND[$i]}" then G_DIETPI-NOTIFY 2 "Applying live patch $i" @@ -1137,7 +1135,7 @@ _EOF_ 78) model='rock-5b' kernel='rk35xx' branch='legacy';; 79) kernel='rk35xx' branch='legacy' case $HW_VARIANT in - 2) model='nanopi-r6c'; G_EXEC sed -i 's/r6s/r6c/' /etc/apt/sources.list.d/dietpi.list;; # ToDo: Temporarily assure correct APT component, until DietPi v9.6 release + 2) model='nanopi-r6c';; 3) model='nanopct6';; *) model='nanopi-r6s';; esac;;