Merge pull request #2068 from Fourdee/testing

**v6.15** (12/09/18) **Many thanks to PINE64, for becoming our 1st Patreon Legend and supporting our project! As one of their rewards, you will see PINE64 displayed on login via the DietPi-Banner.** **Known issues / In progress:** DietPi-Software | Open Bazaar: Installation updated to server version 2, which now runs via go language. At the current state, client OB connections are failing, still under investigation: https://github.com/Fourdee/DietPi/issues/1090#issuecomment-419613346 **Changes / Improvements / Optimizations:** General | Changed Survey and Bugreport uploads to use ssh.dietpi.com (previously IP): https://github.com/Fourdee/DietPi/issues/2022#issuecomment-415470064 General | 1st run setup and dietpi-update logs are now created in RAM, then copied to disk once completed '/var/tmp/dietpi/logs/dietpi-firstrun-setup.log'. This will speed up 1st run setup installation for slow SBCs and/or rootFS. General | PineA64: Image updated to v6.14, also contains the latest kernel/uboot by Ayufan (0.6.2): https://github.com/Fourdee/DietPi/issues/2026 General | Resolved an isssue where the initial 1st run connection test would fail, if timesync had not yet completed, and, the SSL cert of the connection test site is not valid for current date on system: https://github.com/Fourdee/DietPi/issues/2039 General | SparkySBC: Support for native DSD playback on iFi Pro iDSD. Many thanks @sudeep: https://github.com/sparky-sbc/sparky-test/tree/master/dsd-marantz DietPi-Backup/Sync | rsync transfer: Now shows progress information during the transfer: https://github.com/Fourdee/DietPi/issues/2044#issuecomment-417779406 DietPi-Backup | Added an option to delete the currently selected backup, if it exists. DietPi-Config | Advanced Options: You can now toggle if a real RTC is installed. This adds/removes 'fake-hwclock' package installation as requested: https://github.com/Fourdee/DietPi/issues/2041 DietPi-Config | Added support for setting CPU min/max frequencies on Intel based CPUs. NB: 'cpu' command will always list the min/max frequencies read from kernel values, Intel CPUs do not update these values, however, you can gauge CPU frequency range by running 'cpu' to monitor the current CPU freq (use of stress test in 'dietpi-config' may also help). DietPi-Drive_Manager | Added support to set a global idle duration, before drives are powered down. This feature uses hdparm. Not all drives will support this feature, however, its the best we can do, considering the lack of any standardised system across all drives, compatible with hdparm and visa versa: https://github.com/Fourdee/DietPi/issues/2001 DietPi-Drive_Manager | When mounting drives to existing directories, if the directory is empty, you will given an option to mount regardless. If the directory contains any files or data, mounting will be denied: https://github.com/Fourdee/DietPi/issues/2056 DietPi-Software | MPD: Updated to 0.20.21 and now includes SQL (sticker) support by default: https://github.com/Fourdee/DietPi/issues/2032#issuecomment-415559451 DietPi-Software | myMPD: Now available for installation. A recent fork of YMPD with additional features: https://github.com/Fourdee/DietPi/issues/2032#issuecomment-415559451 DietPi-Software | Emby: Reworked the installation to use standalone .debs, for fresh installations only. Now supports ARMv8 devices. ARMv6 devices are not supported: https://github.com/Fourdee/DietPi/issues/534#issuecomment-416405968 **Bug Fixes:** General | fake-hwclock: is now installed for all systems, due to 'hwclock' detection reporting incorrect results, for those devices without a RTC attached: https://github.com/Fourdee/DietPi/issues/2035#issuecomment-416345155 General | Resolved an issue where enabling the RPi camera (dietpi-config or installed via dietpi-software), would result in concurrent execution error: https://github.com/Fourdee/DietPi/issues/2008#issuecomment-414846353 General | Resolved an issue with RK based network devices, where enabling offloading would cause stability issues. Many thanks to @carlosedp for this fix!: https://github.com/Fourdee/DietPi/issues/2028#issue-352323603 General | Resolved an issue where automatic swapfile generation, would not run a freespace check prior: https://github.com/Fourdee/DietPi/issues/2048#issuecomment-417855645 DietPi-Automation | Resolved an issue where 'AUTO_SETUP_INSTALL_SOFTWARE_ID' would include numbers contained within comments: https://github.com/Fourdee/DietPi/issues/2036#issuecomment-416613903 DietPi-Cloudshell | Resolved incorrect RAM usage readout, and, inability to run from menu on same screen: https://github.com/Fourdee/DietPi/issues/2066 DietPi-Config | Resolved an issue with PineA64 resolution changes, due to updated uEnv.txt on the latest PineA64 image. NB: for this feature to work, you must have an installation of the latest PineA64 v6.14 image from the DietPi site: https://dietpi.com/phpbb/viewtopic.php?f=11&t=4431&p=14010#p14010 DietPi-Drive_Manager | Correctly handles bind mounts, contained within '/etc/fstab': https://github.com/Fourdee/DietPi/issues/2013 DietPi-Process_Tool | Resolved an issue with PIDs no longer existing, causing an apply to fail: https://github.com/Fourdee/DietPi/issues/2059 DietPi-Software | PlexPy/Tautulli: Resolved an issue with recent pre-req changes for this application, required for start functionality: https://github.com/Fourdee/DietPi/issues/2047 DietPi-Update | Resolved an issue where all required EMR patches, would not be applied, in the 1st pass of the patch_file.
MichaIng · Sep 12, 2018 · 8e71e3d · 8e71e3d
2 parents 69fed59 + 6993afc
commit 8e71e3d
Show file tree

Hide file tree

Showing 42 changed files with 2,323 additions and 1,829 deletions.
diff --git a/.meta/survey_report b/.meta/survey_report
@@ -126,13 +126,13 @@ aSOFTWARE_NAME=(
 	[73]='Fail2Ban'
 	[74]='InfluxDB'
 	[75]='LASP'
-	[76]='LAAP'
+	[76]='LAMP'
 	[77]='Grafana'
 	[78]='LESP'
-	[79]='LEAP'
+	[79]='LEMP'
 	[80]='NULL'
 	[81]='LLSP'
-	[82]='LLAP'
+	[82]='LLMP'
 	[83]='Apache2'
 	[84]='Lighttpd'
 	[85]='Nginx'
@@ -256,13 +256,34 @@ done
 aSOFTWARE_NAME6_12[2]='NULL' # CurlTMPFS
 aSOFTWARE_NAME6_12[148]='NULL' # JRiver
 
-# - v6.13 testing
+# - v6.13
 aSOFTWARE_NAME6_13=()
 for i in ${!aSOFTWARE_NAME6_12[@]}
 do
 
         aSOFTWARE_NAME6_13[$i]="${aSOFTWARE_NAME6_12[$i]}"
 
+done
+aSOFTWARE_NAME6_13[2]='Folding@Home'
+aSOFTWARE_NAME6_13[106]='Lidarr'
+
+# - v6.14
+aSOFTWARE_NAME6_14=()
+for i in ${!aSOFTWARE_NAME6_13[@]}
+do
+
+        aSOFTWARE_NAME6_14[$i]="${aSOFTWARE_NAME6_13[$i]}"
+
+done
+aSOFTWARE_NAME6_14[38]='FreshRSS'
+
+# - v6.15 testing
+aSOFTWARE_NAME6_15=()
+for i in ${!aSOFTWARE_NAME6_14[@]}
+do
+
+        aSOFTWARE_NAME6_15[$i]="${aSOFTWARE_NAME6_14[$i]}"
+
 done
 
 # Copy files to RAM to speed up grep

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,4 +1,43 @@
 
+v6.15
+(12/09/18)
+
+Many thanks to PINE64, for becoming our 1st Patreon Legend and supporting our project! As one of their rewards, you will see PINE64 displayed on login via the DietPi-Banner.
+
+Known issues / In progress:
+DietPi-Software | Open Bazaar: Installation updated to server version 2, which now runs via go language. At the current state, client OB connections are failing, still under investigation: https://github.com/Fourdee/DietPi/issues/1090#issuecomment-419613346
+
+Changes / Improvements / Optimizations:
+General | Changed Survey and Bugreport uploads to use ssh.dietpi.com (previously IP): https://github.com/Fourdee/DietPi/issues/2022#issuecomment-415470064
+General | 1st run setup and dietpi-update logs are now created in RAM, then copied to disk once completed '/var/tmp/dietpi/logs/dietpi-firstrun-setup.log'. This will speed up 1st run setup installation for slow SBCs and/or rootFS.
+General | PineA64: Image updated to v6.14, also contains the latest kernel/uboot by Ayufan (0.6.2): https://github.com/Fourdee/DietPi/issues/2026
+General | Resolved an isssue where the initial 1st run connection test would fail, if timesync had not yet completed, and, the SSL cert of the connection test site is not valid for current date on system: https://github.com/Fourdee/DietPi/issues/2039
+General| SparkySBC: Support for native DSD playback on iFi Pro iDSD. Many thanks @sudeep: https://github.com/sparky-sbc/sparky-test/tree/master/dsd-marantz
+DietPi-Backup/Sync | rsync transfer: Now shows progress information during the transfer: https://github.com/Fourdee/DietPi/issues/2044#issuecomment-417779406
+DietPi-Backup | Added an option to delete the currently selected backup, if it exists.
+DietPi-Config | Advanced Options: You can now toggle if a real RTC is installed. This adds/removes 'fake-hwclock' package installation as requested: https://github.com/Fourdee/DietPi/issues/2041
+DietPi-Config | Added support for setting CPU min/max frequencies on Intel based CPUs. NB: 'cpu' command will always list the min/max frequencies read from kernel values, Intel CPUs do not update these values, however, you can gauge CPU frequency range by running 'cpu' to monitor the current CPU freq (use of stress test in 'dietpi-config' may also help).
+DietPi-Drive_Manager | Added support to set a global idle duration, before drives are powered down. This feature uses hdparm. Not all drives will support this feature, however, its the best we can do, considering the lack of any standardised system across all drives, compatible with hdparm and visa versa: https://github.com/Fourdee/DietPi/issues/2001
+DietPi-Drive_Manager | When mounting drives to existing directories, if the directory is empty, you will given an option to mount regardless. If the directory contains any files or data, mounting will be denied: https://github.com/Fourdee/DietPi/issues/2056
+DietPi-Software | MPD: Updated to 0.20.21 and now includes SQL (sticker) support by default: https://github.com/Fourdee/DietPi/issues/2032#issuecomment-415559451
+DietPi-Software | myMPD: Now available for installation. A recent fork of YMPD with additional features: https://github.com/Fourdee/DietPi/issues/2032#issuecomment-415559451
+DietPi-Software | Emby: Reworked the installation to use standalone .debs, for fresh installations only. Now supports ARMv8 devices. ARMv6 devices are not supported: https://github.com/Fourdee/DietPi/issues/534#issuecomment-416405968
+
+Bug Fixes:
+General | fake-hwclock: is now installed for all systems, due to 'hwclock' detection reporting incorrect results, for those devices without a RTC attached: https://github.com/Fourdee/DietPi/issues/2035#issuecomment-416345155
+General | Resolved an issue where enabling the RPi camera (dietpi-config or installed via dietpi-software), would result in concurrent execution error: https://github.com/Fourdee/DietPi/issues/2008#issuecomment-414846353
+General | Resolved an issue with RK based network devices, where enabling offloading would cause stability issues. Many thanks to @carlosedp for this fix!: https://github.com/Fourdee/DietPi/issues/2028#issue-352323603
+General | Resolved an issue where automatic swapfile generation, would not run a freespace check prior: https://github.com/Fourdee/DietPi/issues/2048#issuecomment-417855645
+DietPi-Automation | Resolved an issue where 'AUTO_SETUP_INSTALL_SOFTWARE_ID' would include numbers contained within comments: https://github.com/Fourdee/DietPi/issues/2036#issuecomment-416613903
+DietPi-Cloudshell | Resolved incorrect RAM usage readout, and, inability to run from menu on same screen: https://github.com/Fourdee/DietPi/issues/2066
+DietPi-Config | Resolved an issue with PineA64 resolution changes, due to updated uEnv.txt on the latest PineA64 image. NB: for this feature to work, you must have an installation of the latest PineA64 v6.14 image from the DietPi site: https://dietpi.com/phpbb/viewtopic.php?f=11&t=4431&p=14010#p14010
+DietPi-Drive_Manager | Correctly handles bind mounts, contained within '/etc/fstab': https://github.com/Fourdee/DietPi/issues/2013
+DietPi-Process_Tool | Resolved an issue with PIDs no longer existing, causing an apply to fail: https://github.com/Fourdee/DietPi/issues/2059
+DietPi-Software | PlexPy/Tautulli: Resolved an issue with recent pre-req changes for this application, required for start functionality: https://github.com/Fourdee/DietPi/issues/2047
+DietPi-Update | Resolved an issue where all required EMR patches, would not be applied, in the 1st pass of the patch_file.
+
+-----------------------------------------------------------------------------------------------------------
+
 v6.14
 (21/08/18)
 

diff --git a/PREP_SYSTEM_FOR_DIETPI.sh b/PREP_SYSTEM_FOR_DIETPI.sh
@@ -1041,6 +1041,7 @@ _EOF_
 
 		G_RUN_CMD systemctl enable dietpi-ramlog
 		G_RUN_CMD systemctl enable dietpi-boot
+		G_RUN_CMD systemctl enable dietpi-preboot
 		G_RUN_CMD systemctl enable dietpi-postboot
 		G_RUN_CMD systemctl enable kill-ssh-user-sessions-before-network
 
@@ -1174,6 +1175,14 @@ _EOF_
 		/DietPi/dietpi/func/dietpi-set_hardware serialconsole enable
 		# - Disable for post-1st run setup:
 		sed -i '/^[[:blank:]]*CONFIG_SERIAL_CONSOLE_ENABLE=/c\CONFIG_SERIAL_CONSOLE_ENABLE=0' /DietPi/dietpi.txt
+		# - must be enabled for the following:
+		#	XU4: https://github.com/Fourdee/DietPi/issues/2038#issuecomment-416089875
+		#	RockPro64: Fails to boot into kernel without serial enabled
+		if (( $G_HW_MODEL == 11 || $G_HW_MODEL == 42 )); then
+
+			sed -i '/^[[:blank:]]*CONFIG_SERIAL_CONSOLE_ENABLE=/c\CONFIG_SERIAL_CONSOLE_ENABLE=1' /DietPi/dietpi.txt
+
+		fi
 
 		G_DIETPI-NOTIFY 2 'Reducing getty count and resource usage:'
 
@@ -1238,7 +1247,7 @@ _EOF_
 		spindown_time = 120
 
 		#
-		apm = 254
+		apm = 127
 }
 _EOF_
 			export G_ERROR_HANDLER_EXITCODE=$?
@@ -1395,18 +1404,25 @@ _EOF_
 
 		/DietPi/dietpi/func/dietpi-set_hardware wificreds set
 
-		G_DIETPI-NOTIFY 2 'Disabling generic WiFi/BT by default'
+		G_DIETPI-NOTIFY 2 'Disabling generic BT by default'
 
 		/DietPi/dietpi/func/dietpi-set_hardware bluetooth disable
-		/DietPi/dietpi/func/dietpi-set_hardware wifimodules disable
 
-		G_DIETPI-NOTIFY 2 'Enabling onboard WiFi modules by default'
+		# - Set WiFi
+		local tmp_info='Disabling'
+		local tmp_mode='disable'
+		if (( $WIFI_REQUIRED )); then
+
+			tmp_info='Enabling'
+			tmp_mode='enable'
 
-		/DietPi/dietpi/func/dietpi-set_hardware wifimodules onboard_enable
+		fi
 
-		#G_DIETPI-NOTIFY 2 'Configuring IP version preferences'
+		G_DIETPI-NOTIFY 2 "$tmp_info onboard WiFi modules by default"
+		/DietPi/dietpi/func/dietpi-set_hardware wifimodules onboard_$tmp_mode
 
-		#/DietPi/dietpi/func/dietpi-set_hardware preferipversion ipv4 #Already done at top of script, and now default in dietpi.txt
+		G_DIETPI-NOTIFY 2 "$tmp_info generic WiFi by default"
+		/DietPi/dietpi/func/dietpi-set_hardware wifimodules $tmp_mode
 
 		#	x86_64: kernel cmd line with GRUB
 		if (( $G_HW_ARCH == 10 )); then

diff --git a/README.md b/README.md
@@ -219,3 +219,6 @@ FreshRSS
 
 Folding@Home
 - https://github.com/FoldingAtHome
+
+OpenBazaar
+- https://github.com/OpenBazaar/openbazaar-go
diff --git a/dietpi.txt b/dietpi.txt
@@ -128,7 +128,12 @@ AUTO_SETUP_LOCALE=en_GB.UTF-8
 #		Keyboard Layout eg: gb us de fr
 AUTO_SETUP_KEYBOARD_LAYOUT=gb
 
-#	Custom Script | Requires AUTO_SETUP_AUTOMATED=1
+#	Custom Script (pre-networking and pre-DietPi install) | Runs before DietPi installation and networking
+#		Allows you to automatically execute a custom script before networking and DietPi installation is started
+#		Option 1 = Copy your script to /boot/Automation_Custom_PreScript.sh and it will be executed automatically.
+#		NB: Executed script log /var/tmp/dietpi/logs/dietpi-automation_custom_prescript.log
+
+#	Custom Script (post-networking and post-DietPi install) | Runs after DietPi installation is completed
 #		Allows you to automatically execute a custom script at the end of DietPi installation.
 #		Option 1 = Copy your script to /boot/Automation_Custom_Script.sh and it will be executed automatically.
 #		Option 2 = Host your script online, then use AUTO_SETUP_CUSTOM_SCRIPT_EXEC=http://myweb.com/myscript.sh , it will be downloaded and executed automatically. | 0=disabled
@@ -146,13 +151,15 @@ CONFIG_HDMI_OUTPUT=1
 CONFIG_CPU_GOVERNOR=ondemand
 CONFIG_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.
+#CPU Frequency Limits
+#	NB: Intel CPU's use a percentage value (%) from 0-100 (eg: 55)
+#	NB: All other devices must use a specific MHz value (eg: 1600)
+#	Limit the MAX cpu frequency for all cores | Disabled=disabled
 CONFIG_CPU_MAX_FREQ=Disabled
-
-#Limit the min cpu frequency (Mhz) for all cores. | Disabled=disabled | Useful for 1-wire correct support (eg. 480Mhz).
+#	Limit the MIN cpu frequency for all cores | Disabled=disabled
 CONFIG_CPU_MIN_FREQ=Disabled
 
-#Disable Intel based turbo/boost stepping.
+#	Disable Intel based turbo/boost stepping. This flag should not be required, setting <100% MAX frequency should disable Turbo on Intel CPU's.
 CONFIG_CPU_DISABLE_TURBO=0
 
 #Min value 10000 microseconds (10ms)
@@ -183,6 +190,7 @@ CONFIG_WIFI_COUNTRY_CODE=GB
 
 #Serial Console: Set to 1 if you require a serial console.
 #	NB: Serial console is always enabled by default for 1st run setup, then disabled afterwards, unless set below.
+#	NB: must be ENABLED for the following boards: Odroid XU4/HC1/HC2, RockPro64
 CONFIG_SERIAL_CONSOLE_ENABLE=0
 
 #Soundcard

diff --git a/dietpi/.version b/dietpi/.version
@@ -1,2 +1,2 @@
 6
-14
+15