From a280ce4f5724712d6ca596abf0dcc990cb8bbfe7 Mon Sep 17 00:00:00 2001 From: MichaIng Date: Tue, 11 Apr 2023 13:32:08 +0200 Subject: [PATCH] v8.17 - DietPi-Installer | Remove pre-v8.16 code --- .build/images/dietpi-installer | 12 ++---------- dietpi/dietpi-software | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.build/images/dietpi-installer b/.build/images/dietpi-installer index 94898b29a9..42ddaa36ba 100755 --- a/.build/images/dietpi-installer +++ b/.build/images/dietpi-installer @@ -1741,13 +1741,7 @@ _EOF_' elif [[ $G_HW_MODEL =~ ^76|78|79|80$ ]] then /boot/dietpi/func/dietpi-set_hardware serialconsole enable ttyFIQ0 - # ToDo: pre-v8.16 - G_EXEC mkdir -p '/etc/systemd/system/serial-getty@ttyFIQ0.service.d' - cat << _EOF_ > '/etc/systemd/system/serial-getty@ttyFIQ0.service.d/dietpi-baudrate.conf' -[Service] -ExecStart= -$(sed -n '/^ExecStart=/s/ 115200/ 1500000,115200/p' '/lib/systemd/system/serial-getty@.service') -_EOF_ + # Else for physical systems (but Sparky SBC): Enable on all present serial consoles elif (( $G_HW_MODEL != 20 && $G_HW_MODEL != 75 && $G_HW_MODEL != 70 )) then @@ -2043,9 +2037,7 @@ _EOF_ G_DIETPI-NOTIFY 2 'Configuring services' /boot/dietpi/dietpi-services stop - # Pre-v8.16 - # shellcheck disable=SC2015 - [[ $G_GITBRANCH == 'master' ]] && /boot/dietpi/dietpi-services dietpi_controlled || /boot/dietpi/dietpi-services enable + /boot/dietpi/dietpi-services enable G_DIETPI-NOTIFY 2 'Mask cron until 1st run setup is completed' G_EXEC systemctl mask cron diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software index cb91ed542a..048b22bc43 100755 --- a/dietpi/dietpi-software +++ b/dietpi/dietpi-software @@ -8547,7 +8547,7 @@ _EOF_ # Install ruTorrent: Web UI for rTorrent # - Grab current version local version=$(curl -sSfL 'https://api.github.com/repos/Novik/ruTorrent/releases/latest' | mawk -F\" '/"tag_name": /{print $4}') - [[ $version ]] || { version='v4.0.3'; G_DIETPI-NOTIFY 1 "Automatic latest ruTorrent version detection failed. Version \"$version\" will be installed as fallback, but a newer version might be available. Please report this at: https://github.com/MichaIng/DietPi/issues"; } + [[ $version ]] || { version='v4.0.4'; G_DIETPI-NOTIFY 1 "Automatic latest ruTorrent version detection failed. Version \"$version\" will be installed as fallback, but a newer version might be available. Please report this at: https://github.com/MichaIng/DietPi/issues"; } Download_Install "https://github.com/Novik/ruTorrent/archive/$version.tar.gz" # - Reinstall freshly with preserved configs and 3rd party plugins