From 98d348527baa0b7c92557254898c40845b22328e Mon Sep 17 00:00:00 2001
From: "Daniel (Fourdee)" <daniel_haze@hotmail.com>
Date: Fri, 18 Aug 2017 12:25:32 +0100
Subject: [PATCH] v155

+ DietPi-AutoStart | Resolved an issue where OPi devices would fail to
execute selected autostart option:
https://github.com/Fourdee/DietPi/issues/1109

+ DietPi-BugReport | Increased max upload size from 50MB to 80MB:
https://github.com/Fourdee/DietPi/issues/1086#issuecomment-317724186
---
 CHANGELOG.txt           |  2 ++
 dietpi/dietpi-bugreport |  4 ++--
 dietpi/login            | 17 +++++++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f965f5cde7..da57f8ba36 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -10,6 +10,8 @@ DietPi-Config | Networking > WiFi: Added a feature which will monitor the Wifi c
 
 Bug fixes:
 General | (Odroid C2): Resolved an issue where APT would fail to continue, due to deb-multimedia removing ARMv8 (ARM64) packages: https://github.com/Fourdee/DietPi/issues/1096
+DietPi-AutoStart | Resolved an issue where OPi devices would fail to execute selected autostart option: https://github.com/Fourdee/DietPi/issues/1109
+DietPi-BugReport | Increased max upload size from 50MB to 80MB: https://github.com/Fourdee/DietPi/issues/1086#issuecomment-317724186
 DietPi-Software | Mumble/MurMur: Resolved an issue where superuser password was not being set during installation: http://dietpi.com/phpbb/viewtopic.php?f=11&t=2024#p8084
 DietPi-Software | Tondio: Resolved an issue where the installation would fail due to lack of libjpeg8 packages, on Debian repos. Packages now hosted on dietpi.com: https://github.com/Fourdee/DietPi/issues/1101
 DietPi-Software | Sparky SBC: WiFi Hotspot now triggers the RTL driver during install. This is hard coded, to configure for the official Allo WiFi dongle.
diff --git a/dietpi/dietpi-bugreport b/dietpi/dietpi-bugreport
index ff21184830..d13289ba31 100644
--- a/dietpi/dietpi-bugreport
+++ b/dietpi/dietpi-bugreport
@@ -15,12 +15,12 @@
 
 	#Force en_GB Locale for whole script. Prevents incorrect parsing with non-english locales.
 	LANG=en_GB.UTF-8
-	
+
 	#Ensure we are in users home dir: https://github.com/Fourdee/DietPi/issues/905#issuecomment-298223705
 	cd "$HOME"
 
 	# - byte
-	UPLOAD_FILESIZE_LIMIT=52428800
+	UPLOAD_FILESIZE_LIMIT=83886080
 	UPLOAD_FILESIZE=0
 
 	DATE_CURRENT=$(date +"%d-%m-%Y")
diff --git a/dietpi/login b/dietpi/login
index 8727cf50d6..25d71c0583 100644
--- a/dietpi/login
+++ b/dietpi/login
@@ -55,14 +55,15 @@
 		local screen_valid=0
 
 		#OrangePi
-		if (( $HW_MODEL >= 30 )) && (( $HW_MODEL < 40 )); then
-			if [ "$(tty)" = "/dev/pts/0" ]; then
-				screen_valid=1
-			fi
+		# if (( $HW_MODEL >= 30 && $HW_MODEL < 40 )); then
+			# if [ "$(tty)" = "/dev/pts/0" ]; then
+				# screen_valid=1
+			# fi
+
+		if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
 
-		#Everyone else
-		elif [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
 			screen_valid=1
+
 		fi
 
 		#Boot to specific Program
@@ -70,19 +71,23 @@
 
 			#Kodi
 			if (( $AUTO_START_INDEX == 1 )); then
+
 				/DietPi/dietpi/misc/start_kodi
 
 			#Desktop (LXDE/MATE etc)
 			elif (( $AUTO_START_INDEX == 2 )); then
+
 				startx
 
 			#RetroPie/Emulation station
 			elif (( $AUTO_START_INDEX == 3 )); then
+
 				#emulationstation - can no longer be run as root
 				/opt/retropie/supplementary/emulationstation/emulationstation.sh
 
 			#OpenTyrian
 			elif (( $AUTO_START_INDEX == 4 )); then
+
 				/usr/local/games/opentyrian/run
 
 			#DietPi-Cloudshell