Beta v7.0.1 (#4146)

.update/pre-patches

@@ -3,5 +3,26 @@
 # DietPi-Update pre-patches that need to run before new scripts are downloaded and/or before APT upgrades
 # Created by MichaIng / [email protected] / https://dietpi.com/
 # License: GPLv2 / https://github.com/MichaIng/DietPi#license
+
+# Load DietPi-Globals
+. /boot/dietpi/func/dietpi-globals
+readonly G_PROGRAM_NAME='DietPi-Pre-patches'
+G_CHECK_ROOT_USER
+G_CHECK_ROOTFS_RW
+G_INIT
+
+# IMPORTANT: This script can be called with DietPi v6.17, hence assure compatibility!
+# - Pre-v6.29: Create G_EXEC as G_RUN_CMD wrapper
+declare -F G_EXEC > /dev/null || G_EXEC(){ G_RUN_CMD "$@"; }
+
+# Update Jellyfin APT repo key: https://dietpi.com/phpbb/viewtopic.php?t=8703
+if [[ -f '/etc/apt/trusted.gpg.d/dietpi-jellyfin.gpg' && $(date -u '+%Y%m%d' -r '/etc/apt/trusted.gpg.d/dietpi-jellyfin.gpg') -lt 20201216 ]]
+then
+	G_DIETPI-NOTIFY 2 'Updating Jellyfin APT repo key: https://dietpi.com/phpbb/viewtopic.php?t=8703'
+	G_EXEC curl -sSfLO 'https://repo.jellyfin.org/jellyfin_team.gpg.key'
+	G_EXEC gpg --dearmor -o /etc/apt/trusted.gpg.d/dietpi-jellyfin.gpg --yes jellyfin_team.gpg.key
+	G_EXEC rm jellyfin_team.gpg.key
+fi
+
 exit 0
 }

.update/version

@@ -1,7 +1,7 @@
 # Available DietPi version
 G_REMOTE_VERSION_CORE=7
 G_REMOTE_VERSION_SUB=0
-G_REMOTE_VERSION_RC=0
+G_REMOTE_VERSION_RC=1
 # Minimum DietPi version to allow update
 G_MIN_VERSION_CORE=6
 G_MIN_VERSION_SUB=-1

CHANGELOG.txt

@@ -4,13 +4,16 @@ v7.0
 Changes:
 - DietPi-Update | A new update check system has been implemented, which checks for a minimum required Debian and DietPi version and migrates systems with either too old Debian version or too old DietPi version to a different Git branch automatically. This especially smoothens the migration of our code base to newer Debian versions and the alternative branch can be used to inform and support Debian distribution upgrades and to upgrade the DietPi code to an intermediate version from where the system can be migrated back to the regular stable/master branch. Since this change required a new repository version file, we took the chance and incremented the DietPi core version to v7.0. This however has no further meaning, all previously supported DietPi and Debian versions remain supported and the change enables us to not require fresh image installs for major upgrades, like the upgrade from v159 to v6.0 did a few years ago.
 - Network | A change has been implemented on the order in which network-related systemd service targets are reached. "network.target" and "network-online.target" are now reach after all network interfaces have been configured, rather then already after only the loopback interface "lo" has been configured. This affects only systemd services which are not started by DietPi-Services, e.g. SSH/DNS/VPN/VNC servers, with the effect that they are assured to be able to bind to interfaces/IPs, where currently they would fail. The downside is, if one has an Ethernet adapter configured via dietpi-config or /etc/network/interfaces (as allow-hotplug device), but the cable not connected, affected services may be delayed until the interface bring-up timed out.
+- DietPi-Backup | A new feature has been added which allows to automatically restore a dietpi-backup on first boot. For this set the new dietpi.txt option AUTO_SETUP_BACKUP_RESTORE=1, to get a list of found backups to select from (this does not work in combination with AUTO_SETUP_AUTOMATED=1). All attached drives are mounted temporarily and seached automatically. Set AUTO_SETUP_BACKUP_RESTORE=2 to have the first found backup restored non-interactively (this works in combination with AUTO_SETUP_AUTOMATED=1). The restore runs after the initial update, hence works with older images as well and can be done via SSH connection. Credits go to @ravenclaw900 for implementing this feature: https://github.com/MichaIng/DietPi/pull/4112
 - DietPi-Backup | Support for XFS and ZFS target file system types has been added, which fully support the required symlink and POSIX permissions capabilities.
+- DietPi-Config | RPi: An option has been added to toggle the SPI interface. Many thanks to @incanus for resurrecting this old feature request: https://github.com/MichaIng/DietPi/issues/98#issuecomment-783650204
 - DietPi-Software | The mandatory reboot after installs has been removed. Installed services, which are not controlled by DietPi-Services, but would start automatically on reboot, are now started at the end of installs instead. A manual reboot is still a good idea, but strictly required only in rare cases. Many thanks to @Games-Crack for doing this suggesting: https://github.com/MichaIng/DietPi/issues/4032
 - DietPi-Software | Installs do not imply all APT package upgrades anymore. While we recommend to keep all APT packages upgraded regularly, the new daily APT check and info within the DietPi-Banner, helps to keep you informed to do the best decision youself whether and when to apply which package upgrade. On first run installs the full upgrade is however kept, to assure each image starts in fully upgraded state, and packages which are required for the actual software choices you're installing, are upgraded as well, when installed already.
 - DietPi-Software | Uninstalls do not stop other services anymore. E.g. your webserver or media streaming server will stay active while you uninstall that other software that you don't require anymore. Since uninstalls do not require much RAM or CPU resources, this is perfectly fine. Many thanks to @mrgreaper giving the hint: https://github.com/MichaIng/DietPi/issues/4116
 - DietPi-Software | Unbound: On install in combination with Pi-hole, no additional configuration file will be created anymore but the adjusted interface binding and port will be applied to "/etc/unbound/unbound.conf.d/dietpi.conf". Declaring "interface" in two configuration files do not override each other but lead to two concurrent bindings, which is not intended. The two files, if present, will be merged as well on DietPi update. It is hence intended that admins change "dietpi.conf" directly, if required, and this file won't be overwritten on reinstalls to preserve local changes. Additionally, on new installs, the configuration file will be better sorted and contain comments to explain their purpose.
 - DietPi-Software | Unbound: On new installs, by default access is now granted to all private IPv4 and IPv6 address ranges instead of to the 192.168.0.0/16 subnet only, which includes VPNs, containers and cases of multiple local networks the server is attached to.
 - DietPi-Software | Unbound: A monthly cron job is now created to keep the root hints file updated. Many thanks to @APraxx for doing this suggestion: https://github.com/MichaIng/DietPi/issues/4077
+- DietPi-Software | Python 3 pip: pip and pip-based installs on ARMv6 and ARMv7 boards will have the piwheels.org repository for pre-compiled wheels added automatically, which can reduce build dependencies and compile time dramatically.
 - DietPi-Software | Node-RED: New installs and reinstalls with setup Node-RED as local module for the "nodered" service user, rather than as global system module/command. This allows upgrading and removing all related Node modules through the web interface, instead of just the ones which were installed via web interface. Additionally a console alias for the "node-red-admin" CLI command has been added so that running this command with any user will call the local Node-RED instance as "nodered" service user.
 - DietPi-Software | Docker: The Docker APT repository is now installed manually instead of using the official Docker installer. This allows us to enable the Docker install option for Debian Bullseye systems, if only to allow widened testing of this upcoming Debian release with DietPi.
 
@@ -39,6 +42,7 @@ Fixes:
 - DietPi-Software | Domoticz: Resolved an issue where saving custom scripts and starting with a template did not work. Many thanks to @tec13 for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?t=8627
 - DietPi-Software | Resolved an issue where for ruTorrent, Koel and Bitwarden_RS the automatic newest version detection failed and instead a possibly older fallback was used. Many thanks to @kelvmod for reporting this issue: https://github.com/MichaIng/DietPi/issues/4105
 - DietPi-Software | LXQt: Resolved visual issues with our default configuration of Debian Buster, drastically simplified and cleaned up the files we ship.
+- DietPi-Software | SABnzbd: Resolved an issue on Stretch where the install failed due to raised minimum Python version with SABnzbd v3.2.0. If Python 3.5 is installed, SABnzbd v3.1.1 will be installed now to allow keeping the install option enabled for now. Many thanks to @19eighties for reporting this issue: https://github.com/MichaIng/DietPi/issues/2762#issuecomment-787118995
 
 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/4126
 

CONTRIBUTING.md

@@ -9,13 +9,15 @@ Are you able to:
 - Provide feedback and/or test areas of DietPi, to improve the user experience?
 - Report bugs?
 - Improve/add more features to the DietPi [website](https://github.com/MichaIng/DietPi-Website) or [documentation](https://github.com/MichaIng/DietPi-Docs)?
-- Compile software for our supported SBCs?
+- Compile software for our [supported platforms](https://dietpi.com/docs/hardware/)?
 - Contribute to DietPi with programming on GitHub?
 - Suggest new software that we can add to the `dietpi-software` install system?
 
-If so, let us know!
+If so, let us know!  
 We are always looking for talented people who believe in the DietPi project, and, wish to contribute in any way you can.
 
-- Send me an Email: [email protected]
-- Join our forums: https://dietpi.com/phpbb/
-- GitHub: https://github.com/MichaIng/DietPi
+- Send us an email: <[email protected]>
+- Join our forum: <https://dietpi.com/phpbb/>
+- GitHub: <https://github.com/MichaIng/DietPi>
+
+Read more: <https://dietpi.com/contribute.html>

README.md

@@ -1,21 +1,17 @@
-<html>
-	<h1 align="center">
-		<img src="https://raw.githubusercontent.com/MichaIng/DietPi-Website/master/images/dietpi-logo_180x180.png" alt="DietPi Logo">
-	</h1>
-	<p align="center">
-		<b>Lightweight justice for your single-board computer!</b>
-		<br><br>
-		optimised • simplified • for everyone
-		<br><br>
-		<a href="https://dietpi.com/">Website</a> • <a href="https://dietpi.com/docs/">Documentation</a> • <a href="https://dietpi.com/#download">View all supported platforms</a>
-	</p>
-	<hr>
-	<p align="center">
-		<strong>Ready to run</strong> optimised software choices with <a href="https://dietpi.com/dietpi-software.html"><strong>dietpi-software</strong></a>
-		<br>Feature-rich configuration tool for your device with <strong>dietpi-config</strong>.
-	</p>
-	<hr>
-</html>
+<h1 align="center"><img src="https://raw.githubusercontent.com/MichaIng/DietPi-Website/master/images/dietpi-logo_180x180.png" alt="DietPi Logo"></h1>
+<p align="center">
+	<b>Lightweight justice for your single-board computer!</b>
+	<br><br>
+	optimised • simplified • for everyone
+	<br><br>
+	<a href="https://dietpi.com/">Website</a> • <a href="https://dietpi.com/docs/">Documentation</a> • <a href="https://dietpi.com/#download">View all supported platforms</a> • <a href="https://dietpi.com/phpbb/">Forum</a>
+</p>
+<hr>
+<p align="center">
+	<strong>Ready to run</strong> optimised software choices with <a href="https://dietpi.com/dietpi-software.html"><strong>dietpi-software</strong></a>
+	<br>Feature-rich configuration tool for your device with <strong>dietpi-config</strong>.
+</p>
+<hr>
 
 ## Introduction
 
@@ -151,7 +147,7 @@ If so, let us know!
 We are always looking for talented people who believe in the DietPi project, and, wish to contribute in any way you can.
 
 - Send me an Email: [email protected]
-- Join our forums: https://dietpi.com/phpbb/
+- Join our forum: https://dietpi.com/phpbb/
 - GitHub: https://github.com/MichaIng/DietPi
 
 ### FeatHub

dietpi.txt

@@ -67,6 +67,10 @@ AUTO_UNMASK_LOGIND=0
 # - Executed script log: /var/tmp/dietpi/logs/dietpi-automation_custom_script.log
 AUTO_SETUP_CUSTOM_SCRIPT_EXEC=0
 
+# Restore a DietPi-Backup on first boot: 0 => disable | 1 => interactive restore (show list of found backups) | 2 => non-interactive restore (restore first found backup)
+# - Simply attach the drive/disk/stick with contains the backup. All attached drives will be mounted temporarily and searched automatically.
+AUTO_SETUP_BACKUP_RESTORE=0
+
 ##### Software Options #####
 # SSH Server Selection: 0=none/custom | -1=Dropbear | -2=OpenSSH
 AUTO_SETUP_SSH_SERVER_INDEX=-1

dietpi/dietpi-autostart

@@ -103,7 +103,7 @@ _EOF_
 			G_EXEC_NOHALT=1 G_AG_CHECK_INSTALL_PREREQ dbus
 			G_EXEC_NOHALT=1 G_EXEC systemctl unmask systemd-logind
 
-			# Apply tweaks
+			# RPi tweaks
 			if (( $G_HW_MODEL < 10 )); then
 
 				G_CONFIG_INJECT 'boot_delay=' 'boot_delay=0' /boot/config.txt
@@ -114,8 +114,9 @@ _EOF_
 			fi
 
 		# - LightDM: Install only if startx (a desktop) is already installed. This is re-applied by dietpi-software after install automatically.
-		elif (( $ID_AUTOSTART == 16 )) && command -v startx > /dev/null; then
+		elif (( $ID_AUTOSTART == 16 )); then
 
+			command -v X > /dev/null || { G_WHIP_MSG '[FAILED] No X server has been found\n\nLightDM requires an X server. Please install a desktop or other X application first.'; return 1; }
 			G_AG_CHECK_INSTALL_PREREQ lightdm
 			# graphical.target Wants=display-manager.service
 			G_EXEC ln -sf /lib/systemd/system/lightdm.service /etc/systemd/system/display-manager.service
@@ -266,10 +267,9 @@ This mode allows for a < 2.5 second boot on an RPi3, into Amiberry.\n\nIf you ex
 #startx
 
 # Print Hello
-#echo "Hello"
+#echo 'Hello'
 
 #---Put your code below this line---
-
 _EOF_
 				G_WHIP_MSG 'A template script has been created:\n - /var/lib/dietpi/dietpi-autostart/custom.sh\n
 Please edit this file and enter the required commands you wish to launch. DietPi will then execute this script during boot.'