From fbfb5d9112d00e9ce9dfcadc7101aae4c222eff3 Mon Sep 17 00:00:00 2001 From: MichaIng Date: Sun, 12 Dec 2021 17:24:32 +0100 Subject: [PATCH 1/2] v8.0 + DietPi-Patches | Migrate pre-v6.14 systems from alternative branch back to master branch automatically after all incremental patches have been applied. --- .update/patches | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.update/patches b/.update/patches index 2eb97e09b1..0daa695553 100644 --- a/.update/patches +++ b/.update/patches @@ -603,5 +603,10 @@ do G_DIETPI-NOTIFY 0 "Patched to DietPi v$G_DIETPI_VERSION_CORE.$G_DIETPI_VERSION_SUB" done +# Migrate back to "master" branch +G_DIETPI-NOTIFY 2 'Migrating back to master branch after all incremental patches have been applied' +G_CONFIG_INJECT 'DEV_GITBRANCH=' 'DEV_GITBRANCH=master' /boot/dietpi.txt +G_DIETPI-NOTIFY 2 'Rerun "dietpi-update" to continue updating to the latest DietPi version' + exit 0 } From b08b8d016cb0a5bc1170668f7b8a0355156fd971 Mon Sep 17 00:00:00 2001 From: MichaIng Date: Sun, 30 Jan 2022 01:11:56 +0100 Subject: [PATCH 2/2] v8.0 - General | Backport execute bits for all scripts which are meant to be executed, so that pre-v7.0 systems which download the v8.1+ dietpi-update script before being migrated to the "pre-v6.14" branch won't run into failures --- .meta/dietpi-build | 0 .meta/dietpi-cloud-migration | 0 .meta/dietpi-fan_control | 0 .meta/dietpi-survey_report | 0 .update/patches | 0 .update/pre-patches | 0 PREP_SYSTEM_FOR_DIETPI.sh | 0 dietpi/dietpi-autostart | 0 dietpi/dietpi-backup | 0 dietpi/dietpi-bugreport | 0 dietpi/dietpi-cleaner | 0 dietpi/dietpi-cloudshell | 0 dietpi/dietpi-config | 0 dietpi/dietpi-cpuinfo | 0 dietpi/dietpi-cron | 0 dietpi/dietpi-ddns | 0 dietpi/dietpi-drive_manager | 0 dietpi/dietpi-explorer | 0 dietpi/dietpi-launcher | 0 dietpi/dietpi-led_control | 0 dietpi/dietpi-letsencrypt | 0 dietpi/dietpi-login | 0 dietpi/dietpi-morsecode | 0 dietpi/dietpi-services | 0 dietpi/dietpi-software | 0 dietpi/dietpi-survey | 0 dietpi/dietpi-sync | 0 dietpi/dietpi-update | 0 dietpi/dietpi-vpn | 0 dietpi/func/change_hostname | 0 dietpi/func/create_mysql_db | 0 dietpi/func/dietpi-banner | 0 dietpi/func/dietpi-benchmark | 0 dietpi/func/dietpi-logclear | 0 dietpi/func/dietpi-obtain_hw_model | 0 dietpi/func/dietpi-optimal_mtu | 0 dietpi/func/dietpi-ramlog | 0 dietpi/func/dietpi-set_cpu | 0 dietpi/func/dietpi-set_hardware | 0 dietpi/func/dietpi-set_software | 0 dietpi/func/dietpi-set_swapfile | 0 dietpi/func/dietpi-set_userdata | 0 dietpi/func/dietpi-wifidb | 0 dietpi/func/run_ntpd | 0 dietpi/misc/dietpi-arr_to_RAM | 0 dietpi/misc/dietpi-justboom | 0 dietpi/misc/start_kodi | 0 dietpi/patch_file | 0 dietpi/postboot | 0 dietpi/pre-patch_file | 0 dietpi/preboot | 0 rootfs/etc/cron.daily/dietpi | 0 rootfs/etc/cron.hourly/dietpi | 0 rootfs/var/lib/dietpi/services/dietpi-wifi-monitor.sh | 0 rootfs/var/lib/dietpi/services/fs_partition_resize.sh | 0 55 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .meta/dietpi-build mode change 100644 => 100755 .meta/dietpi-cloud-migration mode change 100644 => 100755 .meta/dietpi-fan_control mode change 100644 => 100755 .meta/dietpi-survey_report mode change 100644 => 100755 .update/patches mode change 100644 => 100755 .update/pre-patches mode change 100644 => 100755 PREP_SYSTEM_FOR_DIETPI.sh mode change 100644 => 100755 dietpi/dietpi-autostart mode change 100644 => 100755 dietpi/dietpi-backup mode change 100644 => 100755 dietpi/dietpi-bugreport mode change 100644 => 100755 dietpi/dietpi-cleaner mode change 100644 => 100755 dietpi/dietpi-cloudshell mode change 100644 => 100755 dietpi/dietpi-config mode change 100644 => 100755 dietpi/dietpi-cpuinfo mode change 100644 => 100755 dietpi/dietpi-cron mode change 100644 => 100755 dietpi/dietpi-ddns mode change 100644 => 100755 dietpi/dietpi-drive_manager mode change 100644 => 100755 dietpi/dietpi-explorer mode change 100644 => 100755 dietpi/dietpi-launcher mode change 100644 => 100755 dietpi/dietpi-led_control mode change 100644 => 100755 dietpi/dietpi-letsencrypt mode change 100644 => 100755 dietpi/dietpi-login mode change 100644 => 100755 dietpi/dietpi-morsecode mode change 100644 => 100755 dietpi/dietpi-services mode change 100644 => 100755 dietpi/dietpi-software mode change 100644 => 100755 dietpi/dietpi-survey mode change 100644 => 100755 dietpi/dietpi-sync mode change 100644 => 100755 dietpi/dietpi-update mode change 100644 => 100755 dietpi/dietpi-vpn mode change 100644 => 100755 dietpi/func/change_hostname mode change 100644 => 100755 dietpi/func/create_mysql_db mode change 100644 => 100755 dietpi/func/dietpi-banner mode change 100644 => 100755 dietpi/func/dietpi-benchmark mode change 100644 => 100755 dietpi/func/dietpi-logclear mode change 100644 => 100755 dietpi/func/dietpi-obtain_hw_model mode change 100644 => 100755 dietpi/func/dietpi-optimal_mtu mode change 100644 => 100755 dietpi/func/dietpi-ramlog mode change 100644 => 100755 dietpi/func/dietpi-set_cpu mode change 100644 => 100755 dietpi/func/dietpi-set_hardware mode change 100644 => 100755 dietpi/func/dietpi-set_software mode change 100644 => 100755 dietpi/func/dietpi-set_swapfile mode change 100644 => 100755 dietpi/func/dietpi-set_userdata mode change 100644 => 100755 dietpi/func/dietpi-wifidb mode change 100644 => 100755 dietpi/func/run_ntpd mode change 100644 => 100755 dietpi/misc/dietpi-arr_to_RAM mode change 100644 => 100755 dietpi/misc/dietpi-justboom mode change 100644 => 100755 dietpi/misc/start_kodi mode change 100644 => 100755 dietpi/patch_file mode change 100644 => 100755 dietpi/postboot mode change 100644 => 100755 dietpi/pre-patch_file mode change 100644 => 100755 dietpi/preboot mode change 100644 => 100755 rootfs/etc/cron.daily/dietpi mode change 100644 => 100755 rootfs/etc/cron.hourly/dietpi mode change 100644 => 100755 rootfs/var/lib/dietpi/services/dietpi-wifi-monitor.sh mode change 100644 => 100755 rootfs/var/lib/dietpi/services/fs_partition_resize.sh diff --git a/.meta/dietpi-build b/.meta/dietpi-build old mode 100644 new mode 100755 diff --git a/.meta/dietpi-cloud-migration b/.meta/dietpi-cloud-migration old mode 100644 new mode 100755 diff --git a/.meta/dietpi-fan_control b/.meta/dietpi-fan_control old mode 100644 new mode 100755 diff --git a/.meta/dietpi-survey_report b/.meta/dietpi-survey_report old mode 100644 new mode 100755 diff --git a/.update/patches b/.update/patches old mode 100644 new mode 100755 diff --git a/.update/pre-patches b/.update/pre-patches old mode 100644 new mode 100755 diff --git a/PREP_SYSTEM_FOR_DIETPI.sh b/PREP_SYSTEM_FOR_DIETPI.sh old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-autostart b/dietpi/dietpi-autostart old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-backup b/dietpi/dietpi-backup old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-bugreport b/dietpi/dietpi-bugreport old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-cleaner b/dietpi/dietpi-cleaner old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-cloudshell b/dietpi/dietpi-cloudshell old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-config b/dietpi/dietpi-config old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-cpuinfo b/dietpi/dietpi-cpuinfo old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-cron b/dietpi/dietpi-cron old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-ddns b/dietpi/dietpi-ddns old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-drive_manager b/dietpi/dietpi-drive_manager old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-explorer b/dietpi/dietpi-explorer old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-launcher b/dietpi/dietpi-launcher old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-led_control b/dietpi/dietpi-led_control old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-letsencrypt b/dietpi/dietpi-letsencrypt old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-login b/dietpi/dietpi-login old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-morsecode b/dietpi/dietpi-morsecode old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-services b/dietpi/dietpi-services old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-survey b/dietpi/dietpi-survey old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-sync b/dietpi/dietpi-sync old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-update b/dietpi/dietpi-update old mode 100644 new mode 100755 diff --git a/dietpi/dietpi-vpn b/dietpi/dietpi-vpn old mode 100644 new mode 100755 diff --git a/dietpi/func/change_hostname b/dietpi/func/change_hostname old mode 100644 new mode 100755 diff --git a/dietpi/func/create_mysql_db b/dietpi/func/create_mysql_db old mode 100644 new mode 100755 diff --git a/dietpi/func/dietpi-banner b/dietpi/func/dietpi-banner old mode 100644 new mode 100755 diff --git a/dietpi/func/dietpi-benchmark b/dietpi/func/dietpi-benchmark old mode 100644 new mode 100755 diff --git a/dietpi/func/dietpi-logclear b/dietpi/func/dietpi-logclear old mode 100644 new mode 100755 diff --git a/dietpi/func/dietpi-obtain_hw_model b/dietpi/func/dietpi-obtain_hw_model old mode 100644 new mode 100755 diff --git a/dietpi/func/dietpi-optimal_mtu b/dietpi/func/dietpi-optimal_mtu old mode 100644 new mode 100755 diff --git a/dietpi/func/dietpi-ramlog b/dietpi/func/dietpi-ramlog old mode 100644 new mode 100755 diff --git a/dietpi/func/dietpi-set_cpu b/dietpi/func/dietpi-set_cpu old mode 100644 new mode 100755 diff --git a/dietpi/func/dietpi-set_hardware b/dietpi/func/dietpi-set_hardware old mode 100644 new mode 100755 diff --git a/dietpi/func/dietpi-set_software b/dietpi/func/dietpi-set_software old mode 100644 new mode 100755 diff --git a/dietpi/func/dietpi-set_swapfile b/dietpi/func/dietpi-set_swapfile old mode 100644 new mode 100755 diff --git a/dietpi/func/dietpi-set_userdata b/dietpi/func/dietpi-set_userdata old mode 100644 new mode 100755 diff --git a/dietpi/func/dietpi-wifidb b/dietpi/func/dietpi-wifidb old mode 100644 new mode 100755 diff --git a/dietpi/func/run_ntpd b/dietpi/func/run_ntpd old mode 100644 new mode 100755 diff --git a/dietpi/misc/dietpi-arr_to_RAM b/dietpi/misc/dietpi-arr_to_RAM old mode 100644 new mode 100755 diff --git a/dietpi/misc/dietpi-justboom b/dietpi/misc/dietpi-justboom old mode 100644 new mode 100755 diff --git a/dietpi/misc/start_kodi b/dietpi/misc/start_kodi old mode 100644 new mode 100755 diff --git a/dietpi/patch_file b/dietpi/patch_file old mode 100644 new mode 100755 diff --git a/dietpi/postboot b/dietpi/postboot old mode 100644 new mode 100755 diff --git a/dietpi/pre-patch_file b/dietpi/pre-patch_file old mode 100644 new mode 100755 diff --git a/dietpi/preboot b/dietpi/preboot old mode 100644 new mode 100755 diff --git a/rootfs/etc/cron.daily/dietpi b/rootfs/etc/cron.daily/dietpi old mode 100644 new mode 100755 diff --git a/rootfs/etc/cron.hourly/dietpi b/rootfs/etc/cron.hourly/dietpi old mode 100644 new mode 100755 diff --git a/rootfs/var/lib/dietpi/services/dietpi-wifi-monitor.sh b/rootfs/var/lib/dietpi/services/dietpi-wifi-monitor.sh old mode 100644 new mode 100755 diff --git a/rootfs/var/lib/dietpi/services/fs_partition_resize.sh b/rootfs/var/lib/dietpi/services/fs_partition_resize.sh old mode 100644 new mode 100755 pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy