Merge pull request #2 from Fourdee/testing

Updating Testing with Main Distro

CHANGELOG.txt

@@ -1,6 +1,39 @@
-v156
+v157
 (xx/09/17)
 
+Changes / Improvements / Optimizations:
+General | Ondemand is now the default CPU governor for all devices. Previously Interactive, which is not available in mainline Linux kernel. "Ondemand" has been set for all system in this patch, please revert to another CPU gov as needed.
+General | Improved notifications for when DietPi is installing system with automated flags.
+DietPi-Software | Allo Web Interface: Added for testing purposes only. We will provide release images for Sparky and RPi pre-installed at a later date.
+DietPi-Software | Roon Bridge: Now available for x86_64 systems.
+DietPi-Software | Stretch: TightVNC now disabled as replaced by TigerVNC/VNC4.
+DietPi-Software | Minio: Now available for installation. Object storage server with Amazon S3 compatible API. Many thanks to @techdabbler for contributing this addition! https://github.com/Fourdee/DietPi/pull/1152
+DietPi-Software | Sabnzbd: Updated to 2.3.0 for new installations only. Thanks @hydrouk
+
+Bug fixes:
+DietPi-Drive_Manager | Resolved an issue where "Read Only" drives would incorrectly be displayed as "Disabled".
+DietPi-Services | PHP7-FPM service now correctly controlled.
+DietPi-Software | Stretch: VNC4Server, resolved various issues with tigervnc that prevented successful installation and operation. Disabled "localhost" only by default. TigerVNC packages now removed correctly during uninstall.
+
+Allo Web Interface Changes:
+SYSTEM SETTINGS: When in STATIC IP mode, and changing IP addresses, "Save Settings" button is now shown correctly
+SYSTEM SETTINGS: Improved Swapfile info window information (calculate swap size)
+SYSTEM SETTINGS: Removed "Interactive" CPU gov from "System Settings" Page. This is due to lack of mainline support for "Interactive" (RPi), and, instability seen on ASUS TB. "Ondemand" now recommended and is DietPi default as of v157.
+SYSTEM SETTINGS: DietPi Version number is now shown when no updates are available.
+SYSTEM SETTINGS: Ive added device detection for RPi/Sparky, now coded in. Soundcards listed are dependent on device.
+MPD SETTINGS: Corrected "O!MPD" info window text information.
+MAIN PAGE: Fixed WiFi HotSpot errors when not installed, edit button now disabled and user informed.
+DIETPI-UPDATE: There was an issue with the PHP SSH library used, default timeout was 20 seconds. This would prevent "dietpi-update" from completing successfully. Due to this, all previous "Release Candidate" images, cannot be updated successfully. The latest image is required, with timeout disabled.
+ROON SETTINGS: Disabling Roon Service, will now keep disabled, during reboots.
+SHAIRPORT-SYNC: Ive added ability to change output frequency and bit depth
+
+SYSTEM SETTINGS: Resolved issue with rebooting the system, resulting in an endless hang on GUI.
+
+-----------------------------------------------------------------------------------------------------------
+
+v156
+(22/09/17)
+
 Changes / Improvements / Optimizations:
 General | ASUS TB: Updated image. Includes latest kernel and matches current 2.0.1 TinkerOS image.
 DietPi-Config | Performance > CPU: Added support for setting minimum CPU frequencies. Many thanks to @Filhype for contributing this feature!: https://github.com/Fourdee/DietPi/pull/1148

PREP_SYSTEM_FOR_DIETPI.sh

@@ -87,7 +87,7 @@ echo -e "CONF_SWAPSIZE=0" > /etc/dphys-swapfile
 apt-get install -y gnupg net-tools cron rfkill ca-certificates locales apt-transport-https ethtool p7zip-full hfsplus iw debconf-utils xz-utils fbset wpasupplicant resolvconf bc dbus bzip2 psmisc bash-completion cron whiptail sudo ntp ntfs-3g dosfstools parted hdparm usbutils zip htop wput wget fake-hwclock dphys-swapfile curl unzip console-setup console-data console-common keyboard-configuration wireless-tools wireless-regdb crda --no-install-recommends
 
 #??? Grub/intel+amd microcode firmware x86_64 native
-apt-get install -y grub2
+apt-get install -y grub2 #grub-efi-amd64-bin
 apt-get install firmware-linux-nonfree -y
 
 #??? bluetooth if onboard device / RPI

dietpi.txt

@@ -113,7 +113,7 @@ AUTO_CustomScriptURL=0
 rpi_hdmi_output=1
 
 #Cpu Governor | ondemand | powersave | performance | conservative
-cpu_governor=interactive
+cpu_governor=ondemand
 cpu_usage_throttle_up=50
 
 #Limit the max cpu frequency (Mhz) for all cores. | Disabled=disabled | Useful for lowering temp/power usage on your device.

dietpi/.version

@@ -1 +1 @@
-156
+157

dietpi/dietpi-bugreport

@@ -174,6 +174,8 @@ _EOF_
 			"ls -lha /mnt" #dietpi userdata location
 			"dmesg"
 			"lsmod"
+			"systemctl status *.service -l"
+			"systemctl status *.mount -l"
 
 		)
 

dietpi/dietpi-cpu_set

@@ -42,13 +42,13 @@
 
 			/DietPi/dietpi/func/dietpi-notify 1 "CPU gov: $CPU_GOVERNOR, not supported by kernel"
 
-			if (( $(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors | grep -ci -m1 'interactive') )); then
+			if (( $(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors | grep -ci -m1 'ondemand') )); then
 
-				CPU_GOVERNOR='interactive'
+				CPU_GOVERNOR='ondemand'
 
-			elif (( $(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors | grep -ci -m1 'ondemand') )); then
+			elif (( $(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors | grep -ci -m1 'interactive') )); then
 
-				CPU_GOVERNOR='ondemand'
+				CPU_GOVERNOR='interactive'
 
 			else
 
@@ -93,7 +93,7 @@
 			/DietPi/dietpi/func/dietpi-notify 2 "Setting CPU max freq: $CPU_MAX_FREQ MHz"
 
 		fi
-		
+
 		#Apply CPU min frequency (if set)
 		if [[ $CPU_MIN_FREQ =~ ^-?[0-9]+$ ]] &&
 			(( $CPU_MIN_FREQ > 0 )); then

dietpi/dietpi-drive_manager

@@ -847,7 +847,7 @@
 				fi
 
 				#Read only?
-				if (( ${aDRIVE_ISREADONLY_FSTAB[$INDEX_DRIVE_BEING_EDITED]} )); then
+				if (( ${aDRIVE_ISREADONLY_FSTAB[$INDEX_DRIVE_BEING_EDITED]} || ${aDRIVE_ISREADONLY_CURRENTLY[$INDEX_DRIVE_BEING_EDITED]} )); then
 
 					whiptail_menu_array+=("Read Only" ": Enabled | Select to allow R/W")
 					whiptail_desc+="\nRead only:    Enabled"

dietpi/dietpi-services

@@ -36,6 +36,7 @@
 		'nginx'
 		'lighttpd'
 		'php5-fpm'
+		'php7.0-fpm'
 		'mysql'
 		'mpd'
 		'ympd'
@@ -256,7 +257,7 @@
 
 				echo -e "${aDIETPISERVICE_NAME[$i]}"
 
-				${aDIETPISERVICE_FP[$i]} $1 &> /dev/null
+				${aDIETPISERVICE_FP[$i]} $INPUT_MODE &> /dev/null
 				Print_Status ${aDIETPISERVICE_NAME[$i]} $?
 
 			fi
@@ -267,23 +268,56 @@
 		unset aDIETPISERVICE_FP
 		#????????????????????????????????????????????????????????????????????????
 
+		#### ALLO Special ####
+		aALLO_EXCLUDED_SERVICES_DURING_STOP=(
+			'apache2'
+			'nginx'
+			'lighttpd'
+			'php5-fpm'
+			'php7.0-fpm'
+			'mysql'
+			'avahi-daemon'
+		)
+		#### ALLO Special ####
+
 		#Linux: installed services
 		for ((i=0; i<${#aSERVICE_NAME[@]}; i++))
 		do
 
+			#### ALLO Special ####
+			# - Allo web interface image: Exclude stop on aALLO_EXCLUDED_SERVICES_DURING_STOP service list
+			if [ -d /var/www/allo ] && [ "$INPUT_MODE" = "stop" ]; then
+
+				for ((j=0; j<${#aALLO_EXCLUDED_SERVICES_DURING_STOP[@]}; j++))
+				do
+
+					if [ "${aSERVICE_NAME[$i]}" = "${aALLO_EXCLUDED_SERVICES_DURING_STOP[$j]}" ]; then
+
+						aSERVICE_AVAILABLE[$i]=0
+						break
+
+					fi
+
+				done
+
+			fi
+			#### ALLO Special ####
+
 			#Apply
 			if (( ${aSERVICE_AVAILABLE[$i]} == 1 )); then
 
 				echo -e "${aSERVICE_NAME[$i]}"
 
-				systemctl $1 ${aSERVICE_NAME[$i]} &> /dev/null
+				systemctl $INPUT_MODE ${aSERVICE_NAME[$i]} &> /dev/null
 
 				Print_Status ${aSERVICE_NAME[$i]} $?
 
 			fi
 
 		done
 
+		unset aALLO_EXCLUDED_SERVICES_DURING_STOP
+
 		#????????????????????????????????????????????????????????????????????????
 		# Although this allows for simple service control without using SystemD, we really should convert these to SystemD services. To keep everything consistent, clean, and obtain a correct exit code.
 		#DietPi: Non-service based control for specific dietpi-software installed programs.
@@ -302,7 +336,7 @@
 
 				echo -e "${aDIETPISERVICE_NAME[$i]}"
 
-				${aDIETPISERVICE_FP[$i]} $1 &> /dev/null
+				${aDIETPISERVICE_FP[$i]} $INPUT_MODE &> /dev/null
 				Print_Status ${aDIETPISERVICE_NAME[$i]} $?
 
 			fi
@@ -316,8 +350,8 @@
 		echo -e ""
 
 		#Apply process tool settings
-		if [ "$1" = "start" ] ||
-			[ "$1" = "restart" ]; then
+		if [ "$INPUT_MODE" = "start" ] ||
+			[ "$INPUT_MODE" = "restart" ]; then
 
 			/DietPi/dietpi/dietpi-process_tool 1