diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 967cedb293..ad0e62c17a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,34 @@ +v6.30 +(10/05/30 Hotfix) + +Changes / Improvements / Optimisations: +- DietPi-Software | qBittorrent: Changed default download file permissions so that Sonarr/Radarr/Lidarr/.. are able to manipulate the downloads after import. Many thanks to @compdealer for doing this suggestion: https://github.com/MichaIng/DietPi/issues/3524 + +Bug Fixes: +- DietPi-Config | Resolved an issue where on RPi3/4/Zero W onboard WiFi could not be enabled. Many thanks to @elitearmedforce for reporting this issue: https://github.com/MichaIng/DietPi/issues/3510 +- DietPi-Drive_Manager | Resolved an issue on Raspberry Pi where, after running DietPi-Drive_Manager, the root file system was mount read-only. Many thanks to @Adsouza98 for reporting this issue: https://github.com/MichaIng/DietPi/issues/3511 +- DietPi-Banner | Resolved an issue where non-root users were unable to download a new MOTD (message of the day). Many thanks to @PeterLacknase and @fnsnyc for reporting this issue: https://github.com/MichaIng/DietPi/issues/3505, https://github.com/MichaIng/DietPi/issues/3520 +- DietPi-Boot | Resolved an issue where non-root users were unable to read or update DietPi-internal network info, which lead to e.g. error messages on login. Many thanks to @PeterLacknase for reporting this issue: https://github.com/MichaIng/DietPi/issues/3505 +- DietPi-Update | Resolved an issue where on DietPi pre-v6.16 system some DietPi scripts were accidentally removed during update. Many thanks to @Vec7or and @littis for reporting this issue: https://github.com/MichaIng/DietPi/issues/3509, https://github.com/MichaIng/DietPi/issues/3513 + +Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/3526 + +Known/Outstanding Issues: +- DietPi-Config | Enabling WiFi + Ethernet adapters, both on different subnets, breaks WiFi connection in some cases: https://github.com/MichaIng/DietPi/issues/2103 +- RPi | On TigerVNC virtual desktop, LXAppearance hangs on dbus-launch: https://github.com/MichaIng/DietPi/issues/1791 +- Odroid C2 | Some WiFi adapters do no work as hotspot: https://github.com/MichaIng/DietPi/issues/1955 +- Odroid XU4 | Kodi freezes shortly on video playback: https://github.com/MichaIng/DietPi/issues/2584 +- Rock64 | 3.5mm A/V jack is currently not functional: https://github.com/MichaIng/DietPi/issues/2522 +- DietPi-Software | Node-RED: Pre-installed modules cannot be updated via web UI: https://github.com/MichaIng/DietPi/issues/2073 +- DietPi-Software | Raspimjpeg: With Lighttpd, streaming mjpeg does not work: https://github.com/MichaIng/DietPi/issues/1747 +- DietPi-Software | MATE desktop: When logging in as root, desktop items and right-clock context menu is missing: https://github.com/MichaIng/DietPi/issues/3160 +- DietPi-Software | Sonarr/Mono: With current Mono version 6, import to a file system without UNIX permissions support (exFAT, FAT32/vfat and NTFS without "permissions" option) fails, regardless of user/umask mount options: https://github.com/MichaIng/DietPi/issues/3179 +- DietPi-Software | Transmission: On Raspbian/Debian Stretch, RAM usage raises unlimited over time: https://github.com/MichaIng/DietPi/issues/2413 + +For all additional issues that may appear after release, please see the following link for active tickets: https://github.com/MichaIng/DietPi/issues + +----------------------------------------------------------------------------------------------------------- + v6.29 (03/05/20) @@ -57,20 +88,6 @@ Bug Fixes: As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/3502 -Known/Outstanding Issues: -- DietPi-Config | Enabling WiFi + Ethernet adapters, both on different subnets, breaks WiFi connection in some cases: https://github.com/MichaIng/DietPi/issues/2103 -- RPi | On TigerVNC virtual desktop, LXAppearance hangs on dbus-launch: https://github.com/MichaIng/DietPi/issues/1791 -- Odroid C2 | Some WiFi adapters do no work as hotspot: https://github.com/MichaIng/DietPi/issues/1955 -- Odroid XU4 | Kodi freezes shortly on video playback: https://github.com/MichaIng/DietPi/issues/2584 -- Rock64 | 3.5mm A/V jack is currently not functional: https://github.com/MichaIng/DietPi/issues/2522 -- DietPi-Software | Node-RED: Pre-installed modules cannot be updated via web UI: https://github.com/MichaIng/DietPi/issues/2073 -- DietPi-Software | Raspimjpeg: With Lighttpd, streaming mjpeg does not work: https://github.com/MichaIng/DietPi/issues/1747 -- DietPi-Software | MATE desktop: When logging in as root, desktop items and right-clock context menu is missing: https://github.com/MichaIng/DietPi/issues/3160 -- DietPi-Software | Sonarr/Mono: With current Mono version 6, import to a file system without UNIX permissions support (exFAT, FAT32/vfat and NTFS without "permissions" option) fails, regardless of user/umask mount options: https://github.com/MichaIng/DietPi/issues/3179 -- DietPi-Software | Transmission: On Raspbian/Debian Stretch, RAM usage raises unlimited over time: https://github.com/MichaIng/DietPi/issues/2413 - -For all additional issues that may appear after release, please see the following link for active tickets: https://github.com/MichaIng/DietPi/issues - ----------------------------------------------------------------------------------------------------------- v6.28 diff --git a/PREP_SYSTEM_FOR_DIETPI.sh b/PREP_SYSTEM_FOR_DIETPI.sh index 9e7614e5b4..753825adab 100644 --- a/PREP_SYSTEM_FOR_DIETPI.sh +++ b/PREP_SYSTEM_FOR_DIETPI.sh @@ -289,7 +289,7 @@ umount /DietPi # Failsafe [[ -d '/DietPi' ]] && rm -R /DietPi rm -Rfv /{boot,mnt,etc,var/lib,var/tmp,run}/*dietpi* - rm -fv /etc/{cron.*,{bashrc,profile,sysctl,network/if-up,udev/rules}.d}/*dietpi* + rm -fv /etc{,/cron.*,/{bashrc,profile,sysctl,network/if-up,udev/rules}.d}/{,.}*dietpi* [[ -f '/root/DietPi-Automation.log' ]] && rm -v /root/DietPi-Automation.log [[ -f '/boot/Automation_Format_My_Usb_Drive' ]] && rm -v /boot/Automation_Format_My_Usb_Drive @@ -382,6 +382,7 @@ # NB: PLEASE ENSURE HW_MODEL INDEX ENTRIES MATCH dietpi-obtain_hw_model and dietpi-survey_report # NBB: DO NOT REORDER INDICES. These are now fixed and will never change (due to survey results etc) G_WHIP_BUTTON_CANCEL_TEXT='Exit' + G_WHIP_DEFAULT_ITEM=0 G_WHIP_MENU_ARRAY=( '' '●─ ARM ─ Core devices with GPU support ' @@ -474,9 +475,6 @@ G_HW_MODEL=$HW_MODEL unset HW_MODEL - # + Set for future scripts - echo $G_HW_MODEL > /etc/.dietpi_hw_model_identifier - G_DIETPI-NOTIFY 2 "Selected hardware model ID: $G_HW_MODEL" G_DIETPI-NOTIFY 2 "Detected CPU architecture: $G_HW_ARCH_NAME (ID: $G_HW_ARCH)" @@ -660,7 +658,7 @@ Currently installed: $G_DISTRO_NAME (ID: $G_DISTRO)"; then G_DIETPI-NOTIFY 2 "Setting APT sources.list: $DISTRO_TARGET_NAME $DISTRO_TARGET" # We need to forward $DISTRO_TARGET* to dietpi-set_software, as well as $G_HW_MODEL for Debian vs Raspbian decision. - G_DISTRO=$DISTRO_TARGET G_DISTRO_NAME=$DISTRO_TARGET_NAME G_HW_MODEL=$G_HW_MODEL G_EXEC /boot/dietpi/func/dietpi-set_software apt-mirror 'default' + G_DISTRO=$DISTRO_TARGET G_DISTRO_NAME=$DISTRO_TARGET_NAME G_HW_MODEL=$G_HW_MODEL G_EXEC /boot/dietpi/func/dietpi-set_software apt-mirror default # Meveric, update repo to use our EU mirror: https://github.com/MichaIng/DietPi/issues/1519#issuecomment-368234302 sed -Ei 's@https?://oph\.mdrjr\.net@http://fuzon.co.uk@' /etc/apt/sources.list.d/meveric* &> /dev/null @@ -1319,6 +1317,7 @@ _EOF_' systemctl disable --now e2scrub_all.timer 2> /dev/null systemctl disable --now e2scrub_reap 2> /dev/null + (( $G_HW_MODEL > 9 )) && echo $G_HW_MODEL > /etc/.dietpi_hw_model_identifier G_EXEC_DESC='Generating /boot/dietpi/.hw_model' G_EXEC /boot/dietpi/func/dietpi-obtain_hw_model G_EXEC_DESC='Generating /etc/fstab' G_EXEC /boot/dietpi/dietpi-drive_manager 4 @@ -1754,11 +1753,7 @@ _EOF_ /boot/dietpi/func/dietpi-set_software apt-cache cache disable /boot/dietpi/func/dietpi-set_software apt-cache clean - # - HW Specific - # RPi remove saved G_HW_MODEL, allowing obtain-hw_model to auto detect RPi model - (( $G_HW_MODEL < 10 )) && [[ -f '/etc/.dietpi_hw_model_identifier' ]] && rm -v /etc/.dietpi_hw_model_identifier - - # - BBB remove fsexpansion: https://github.com/MichaIng/DietPi/issues/931#issuecomment-345451529 + # BBB remove fsexpansion: https://github.com/MichaIng/DietPi/issues/931#issuecomment-345451529 if (( $G_HW_MODEL == 71 )); then systemctl disable dietpi-fs_partition_resize diff --git a/dietpi/boot b/dietpi/boot index a61e6fca78..8f70c88c61 100644 --- a/dietpi/boot +++ b/dietpi/boot @@ -60,7 +60,7 @@ # Write network details to /run/dietpi/.network /boot/dietpi/func/obtain_network_details # - Make file world-writeable initially, required for DietPi-Login to update it as non-root user - chown 666 /run/dietpi/.network + chmod 666 /run/dietpi/.network #---------------------------------------------------------------- } diff --git a/dietpi/dietpi-drive_manager b/dietpi/dietpi-drive_manager index 0233c18ddf..4f5fb5e760 100644 --- a/dietpi/dietpi-drive_manager +++ b/dietpi/dietpi-drive_manager @@ -162,13 +162,14 @@ $swap_mounts while read line do + # Workaround for /dev/root under RPi, force physical location + [[ $line == '/dev/root' ]] && { grep -q "^$G_ROOTFS_DEV$" .df_out_tmp && continue || line=$G_ROOTFS_DEV; } + Init_New_Device aDRIVE_ISMOUNTED[$index]=1 aDRIVE_MOUNT_SOURCE[$index]=$line aDRIVE_MOUNT_TARGET[$index]=$(findmnt -no TARGET "${aDRIVE_MOUNT_SOURCE[$index]}" | head -1) # Use only first result since bind mounts lead to multiple matches - # Workaround for /dev/root under RPi, force physical location - [[ ${aDRIVE_MOUNT_TARGET[$index]} == '/' ]] && aDRIVE_MOUNT_SOURCE[$index]=$G_ROOTFS_DEV aDRIVE_SIZE_TOTAL[$index]=$(findmnt -rno SIZE "${aDRIVE_MOUNT_TARGET[$index]}") aDRIVE_SIZE_USED[$index]=$(findmnt -rno USED "${aDRIVE_MOUNT_TARGET[$index]}") aDRIVE_SIZE_PERCENTUSED[$index]=$(findmnt -rno USE% "${aDRIVE_MOUNT_TARGET[$index]}") diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software index 684c8d0d87..dd83a412a6 100644 --- a/dietpi/dietpi-software +++ b/dietpi/dietpi-software @@ -764,8 +764,8 @@ DietPi-Software will decrypt and use it for software installs. You can change it aSOFTWARE_NAME[$software_id]='Raspotify' aSOFTWARE_DESC[$software_id]='spotify connect client' - aSOFTWARE_CATEGORY_INDEX[$software_id]=2 aSOFTWARE_TYPE[$software_id]=0 + aSOFTWARE_CATEGORY_INDEX[$software_id]=2 aSOFTWARE_REQUIRES_ALSA[$software_id]=1 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=9368#p9368' # - ARMv8 @@ -777,8 +777,8 @@ DietPi-Software will decrypt and use it for software installs. You can change it aSOFTWARE_NAME[$software_id]='Ubooquity' aSOFTWARE_DESC[$software_id]='a free home server for your comics and ebooks library' - aSOFTWARE_CATEGORY_INDEX[$software_id]=2 aSOFTWARE_TYPE[$software_id]=0 + aSOFTWARE_CATEGORY_INDEX[$software_id]=2 aSOFTWARE_REQUIRES_JAVA_JRE_JDK[$software_id]=1 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=12969#p12969' #------------------ @@ -786,8 +786,8 @@ DietPi-Software will decrypt and use it for software installs. You can change it aSOFTWARE_NAME[$software_id]='Roon Extension Manager' aSOFTWARE_DESC[$software_id]='Manage extensions from within Roon' - aSOFTWARE_CATEGORY_INDEX[$software_id]=2 aSOFTWARE_TYPE[$software_id]=0 + aSOFTWARE_CATEGORY_INDEX[$software_id]=2 aSOFTWARE_REQUIRES_GIT[$software_id]=1 aSOFTWARE_REQUIRES_NODEJS[$software_id]=1 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=13160#p13160' @@ -798,21 +798,21 @@ DietPi-Software will decrypt and use it for software installs. You can change it aSOFTWARE_NAME[$software_id]='Transmission' aSOFTWARE_DESC[$software_id]='bittorrent server with web interface (c)' - aSOFTWARE_CATEGORY_INDEX[$software_id]=3 aSOFTWARE_TYPE[$software_id]=0 + aSOFTWARE_CATEGORY_INDEX[$software_id]=3 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=46#p46' #------------------ software_id=45 aSOFTWARE_NAME[$software_id]='Deluge' aSOFTWARE_DESC[$software_id]='bittorrent server with web interface (python)' - aSOFTWARE_CATEGORY_INDEX[$software_id]=3 aSOFTWARE_TYPE[$software_id]=0 + aSOFTWARE_CATEGORY_INDEX[$software_id]=3 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=61#p61' #------------------ software_id=46 - aSOFTWARE_NAME[$software_id]='qBitTorrent' + aSOFTWARE_NAME[$software_id]='qBittorrent' aSOFTWARE_DESC[$software_id]='bittorrent server with web interface (c++)' aSOFTWARE_TYPE[$software_id]=0 aSOFTWARE_CATEGORY_INDEX[$software_id]=3 @@ -832,16 +832,16 @@ DietPi-Software will decrypt and use it for software installs. You can change it aSOFTWARE_NAME[$software_id]='Medusa' aSOFTWARE_DESC[$software_id]='Automatic Video Library Manager for TV Shows' - aSOFTWARE_CATEGORY_INDEX[$software_id]=3 aSOFTWARE_TYPE[$software_id]=0 + aSOFTWARE_CATEGORY_INDEX[$software_id]=3 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=3327#p3327' #------------------ software_id=132 aSOFTWARE_NAME[$software_id]='Aria2' aSOFTWARE_DESC[$software_id]='download manager with web interface' - aSOFTWARE_CATEGORY_INDEX[$software_id]=3 aSOFTWARE_TYPE[$software_id]=0 + aSOFTWARE_CATEGORY_INDEX[$software_id]=3 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=6177#p6177' aSOFTWARE_REQUIRES_WEBSERVER[$software_id]=1 aSOFTWARE_REQUIRES_PHP[$software_id]=1 @@ -851,8 +851,8 @@ DietPi-Software will decrypt and use it for software installs. You can change it aSOFTWARE_NAME[$software_id]='SABnzbd' aSOFTWARE_DESC[$software_id]='nzb download manager' - aSOFTWARE_CATEGORY_INDEX[$software_id]=3 aSOFTWARE_TYPE[$software_id]=0 + aSOFTWARE_CATEGORY_INDEX[$software_id]=3 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=6747#p6747' # Pre-compiling required on ARM (( $G_HW_ARCH < 10 )) && aSOFTWARE_REQUIRES_BUILDESSENTIAL[$software_id]=1 @@ -861,8 +861,8 @@ DietPi-Software will decrypt and use it for software installs. You can change it aSOFTWARE_NAME[$software_id]='CouchPotato' aSOFTWARE_DESC[$software_id]='automatically download movies' - aSOFTWARE_CATEGORY_INDEX[$software_id]=3 aSOFTWARE_TYPE[$software_id]=0 + aSOFTWARE_CATEGORY_INDEX[$software_id]=3 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=7212#p7212' aSOFTWARE_REQUIRES_BUILDESSENTIAL[$software_id]=1 aSOFTWARE_REQUIRES_GIT[$software_id]=1 @@ -5033,7 +5033,7 @@ Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=bullseye\nPin- fi - software_id=46 # qBitTorrent + software_id=46 # qBittorrent if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then Banner_Installing @@ -10206,7 +10206,7 @@ _EOF_ fi - software_id=46 # qBitTorrent + software_id=46 # qBittorrent if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then Banner_Configuration @@ -10301,12 +10301,13 @@ _EOF_ cat << _EOF_ > /etc/systemd/system/qbittorrent.service [Unit] Description=qBittorrent (DietPi) +Documentation=man:qbittorrent-nox(1) Wants=network-online.target -After=network-online.target +After=network-online.target dietpi-boot.service [Service] User=qbittorrent -RemainAfterExit=yes +UMask=002 ExecStart=$(command -v qbittorrent-nox) --webui-port=1340 [Install] @@ -13776,7 +13777,7 @@ _EOF_ fi - software_id=46 # qBitTorrent + software_id=46 # qBittorrent if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then Banner_Uninstalling diff --git a/dietpi/func/dietpi-banner b/dietpi/func/dietpi-banner index b4dda64cec..aac73a1bf7 100644 --- a/dietpi/func/dietpi-banner +++ b/dietpi/func/dietpi-banner @@ -226,7 +226,7 @@ $GREEN_LINE" echo -e "$GREEN_BULLET ${aCOLOUR[1]}${aDESCRIPTION[12]} $GREEN_SEPARATOR $motd" - else + elif [[ -w $fp_motd ]]; then rm $fp_motd diff --git a/dietpi/func/dietpi-globals b/dietpi/func/dietpi-globals index 909a017f6c..05f19d0035 100644 --- a/dietpi/func/dietpi-globals +++ b/dietpi/func/dietpi-globals @@ -56,8 +56,8 @@ [[ -f '/boot/dietpi/.version' ]] && . /boot/dietpi/.version # - Assign defaults/code version as fallback [[ $G_DIETPI_VERSION_CORE ]] || G_DIETPI_VERSION_CORE=6 - [[ $G_DIETPI_VERSION_SUB ]] || G_DIETPI_VERSION_SUB=29 - [[ $G_DIETPI_VERSION_RC ]] || G_DIETPI_VERSION_RC=2 + [[ $G_DIETPI_VERSION_SUB ]] || G_DIETPI_VERSION_SUB=30 + [[ $G_DIETPI_VERSION_RC ]] || G_DIETPI_VERSION_RC=0 [[ $G_GITBRANCH ]] || G_GITBRANCH='master' [[ $G_GITOWNER ]] || G_GITOWNER='MichaIng' # - Save current version and Git branch @@ -80,17 +80,7 @@ G_GITOWNER='$G_GITOWNER'" > /boot/dietpi/.version #[[ $G_DIETPI_SERVICES_DISABLE == [01] ]] || G_DIETPI_SERVICES_DISABLE=0 # Hardware details - # - Failsafe, recreate info file, if missing - if [[ -f '/boot/dietpi/.hw_model' ]]; then - - . /boot/dietpi/.hw_model - - elif [[ -f '/boot/dietpi/func/dietpi-obtain_hw_model' ]]; then - - /boot/dietpi/func/dietpi-obtain_hw_model - . /boot/dietpi/.hw_model - - fi + [[ -f '/boot/dietpi/.hw_model' ]] && . /boot/dietpi/.hw_model # Init functions for originating script # - Stuff we can't init in main globals/funcs due to /etc/bashrc.d/ load into login session. diff --git a/dietpi/func/dietpi-obtain_hw_model b/dietpi/func/dietpi-obtain_hw_model index 5178298569..ed6c40649e 100644 --- a/dietpi/func/dietpi-obtain_hw_model +++ b/dietpi/func/dietpi-obtain_hw_model @@ -143,14 +143,14 @@ 04) G_HW_MODEL_NAME='RPi 2 Model B' G_HW_MODEL=2;; 05) G_HW_MODEL_NAME='RPi Alpha';; 06) G_HW_MODEL_NAME='RPi CM';; - 08) G_HW_MODEL_NAME='RPi 3 Model B' G_HW_MODEL=3 HW_ONBOARD_WIFI=1;; + 08) G_HW_MODEL_NAME='RPi 3 Model B' G_HW_MODEL=3 G_HW_ONBOARD_WIFI=1;; 09) G_HW_MODEL_NAME='RPi Zero';; 0a) G_HW_MODEL_NAME='RPi CM 3' G_HW_MODEL=3;; - 0c) G_HW_MODEL_NAME='RPi Zero W' HW_ONBOARD_WIFI=1;; - 0d) G_HW_MODEL_NAME='RPi 3 Model B+' G_HW_MODEL=3 HW_ONBOARD_WIFI=1;; - 0e) G_HW_MODEL_NAME='RPi 3 Model A+' G_HW_MODEL=3 HW_ONBOARD_WIFI=1;; + 0c) G_HW_MODEL_NAME='RPi Zero W' G_HW_ONBOARD_WIFI=1;; + 0d) G_HW_MODEL_NAME='RPi 3 Model B+' G_HW_MODEL=3 G_HW_ONBOARD_WIFI=1;; + 0e) G_HW_MODEL_NAME='RPi 3 Model A+' G_HW_MODEL=3 G_HW_ONBOARD_WIFI=1;; 10) G_HW_MODEL_NAME='RPi CM 3+' G_HW_MODEL=3;; - 11) G_HW_MODEL_NAME='RPi 4 Model B' G_HW_MODEL=4 HW_ONBOARD_WIFI=1;; + 11) G_HW_MODEL_NAME='RPi 4 Model B' G_HW_MODEL=4 G_HW_ONBOARD_WIFI=1;; esac # Manufacturer case ${G_HW_REVISION: -5:1} in diff --git a/dietpi/patch_file b/dietpi/patch_file index 9c1b4e8208..ed62380d6e 100644 --- a/dietpi/patch_file +++ b/dietpi/patch_file @@ -16,9 +16,6 @@ # - /boot/dietpi/patch_file [$G_DIETPI_VERSION_SUB] #//////////////////////////////////// - # Pre-v6.22: Update Git owner due to official lead transfer from Fourdee to MichaIng: https://github.com/MichaIng/DietPi/issues/2589 - grep -q '^[[:blank:]]*DEV_GITOWNER=Fourdee' /boot/dietpi.txt && sed -i '/^[[:blank:]]*DEV_GITOWNER=/c\DEV_GITOWNER=MichaIng' /boot/dietpi.txt - # Move Jessie systems to "jessie-support" branch: https://github.com/MichaIng/DietPi/issues/2332 # - We check/apply this already via pre-patches but do as well here since older DietPi versions do not yet run pre-patches. # - Do not apply any further patches, restart immediately, so we don't need to think about Jessie systems when adding further patches. @@ -47,6 +44,9 @@ fi + # Pre-v6.22: Update Git owner due to official lead transfer from Fourdee to MichaIng: https://github.com/MichaIng/DietPi/issues/2589 + grep -q '^[[:blank:]]*DEV_GITOWNER=Fourdee' /DietPi/dietpi.txt && sed -i '/^[[:blank:]]*DEV_GITOWNER=/c\DEV_GITOWNER=MichaIng' /DietPi/dietpi.txt + # Remove DietPi-Update and DietPi-Patch working directories to allow concurrent execution. cd /tmp rm -Rf /tmp/DietPi-{Update,Patch} @@ -97,6 +97,9 @@ # - Create network info file on new location [[ -f '/run/dietpi/.network' ]] || /boot/dietpi/func/obtain_network_details && chmod 666 /run/dietpi/.network + # Pre-v6.22: Update Git owner due to official lead transfer from Fourdee to MichaIng: https://github.com/MichaIng/DietPi/issues/2589 + grep -q '^[[:blank:]]*DEV_GITOWNER=Fourdee' /boot/dietpi.txt && sed -i '/^[[:blank:]]*DEV_GITOWNER=/c\DEV_GITOWNER=MichaIng' /boot/dietpi.txt + if [[ -f '/boot/dietpi/.version' ]] && grep -q '^G_GITOWNER=Fourdee' /boot/dietpi/.version; then sed -i '/^G_GITOWNER=/c\G_GITOWNER=MichaIng' /boot/dietpi/.version @@ -147,9 +150,9 @@ _EOF_ # NanoPi M4v2 (58) # Pine H64 (45) # ROCK Pi S (73) - if [[ $(