Merge pull request #1129 from Fourdee/testing

v155
(02/09/17)

**New Image:**

Rock64 | Now available for beta testing: https://github.com/Fourdee/DietPi/issues/1102#issuecomment-325131437

**Changes / Improvements / Optimizations:**

General | RPi: Kernel updated to 4.9.40. Includes improved driver support for Allo Piano and DiGi One: raspberrypi/linux#2149

General | dietpi.txt: Added an dev option to force a resize + expansion on rootfs partition for next boot (fs_force_resize=1)

General | RT kernel for RPi is now available, can be installed with "/DietPi/dietpi/func/dietpi-set_hardware kernel dietpi_rpi_rt"

General | Reworked the disabled modules for Sparky. Disables touchscreen and GPU modules (thanks @sudeep).

General | Sparky Image updated to Stretch, includes kernel update for DSD256/512 support.

DietPi-Config | Networking > WiFi: Added a feature which will monitor the Wifi connection and automatically reconnect, if the gateway is unavailable (eg: connection drop): https://github.com/Fourdee/DietPi/issues/1074

DietPi-Software | Home Assistant: Now available for installation. Many thanks to @sytone for adding this: https://github.com/Fourdee/DietPi/pull/1087

DietPi-Software | Sabnzbd: Updated to 2.1.0 for new installations only: https://github.com/Fourdee/DietPi/issues/865#issuecomment-319110395

DietPi-Software | Kodi: Now installs avahi-daemon by default: http://dietpi.com/phpbb/viewtopic.php?f=11&t=2148&p=8323#p8316

DietPi-Software | sabnzbd: Updated to latest version (2.2.1), existing installations will need to uninstall/reinstall to update: https://github.com/Fourdee/DietPi/issues/865#issuecomment-325454351

**Bug fixes:**

General | Auto Swapfile generation: Size is now set to "2048 - total memory" to prevent out of memory errors during Koel installations and in general. "1024 - total RAM" was previous. All systems will have swapfile regenerated during this patch, you can change this afterwards in dietpi-config > advanced options: https://github.com/Fourdee/DietPi/issues/1126

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

General | Fix error log on disabled IPv6 (thanks @MichaIng): https://github.com/Fourdee/DietPi/pull/1120/

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-Config | Corrected firmware upgrade code for OrangePi devices: http://dietpi.com/phpbb/viewtopic.php?f=11&t=2149&p=8295#p8295

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.

DietPi-Software | Mopidy: Resolved an issue where the libary would fail to update. Many thanks to Sciamano: http://dietpi.com/phpbb/viewtopic.php?f=11&t=2112

DietPi-Software | Emby: Resolved an issue where unavailable libjpeg8 packages from Jessie/Stretch, would cause this installation to fail: https://github.com/Fourdee/DietPi/issues/1128#issuecomment-326743471

Author: Fourdee

CHANGELOG.txt

@@ -1,3 +1,36 @@
+v155
+(02/09/17)
+
+New Image:
+Rock64 | Now available for beta testing: https://github.com/Fourdee/DietPi/issues/1102#issuecomment-325131437
+
+Changes / Improvements / Optimizations:
+General | RPi: Kernel updated to 4.9.40. Includes improved driver support for Allo Piano and DiGi One: https://github.com/raspberrypi/linux/pull/2149
+General | dietpi.txt: Added an dev option to force a resize + expansion on rootfs partition for next boot (fs_force_resize=1)
+General | RT kernel for RPi is now available, can be installed with "/DietPi/dietpi/func/dietpi-set_hardware kernel dietpi_rpi_rt"
+General | Reworked the disabled modules for Sparky. Disables touchscreen and GPU modules (thanks @sudeep).
+General | Sparky Image updated to Stretch, includes kernel update for DSD256/512 support.
+DietPi-Config | Networking > WiFi: Added a feature which will monitor the Wifi connection and automatically reconnect, if the gateway is unavailable (eg: connection drop): https://github.com/Fourdee/DietPi/issues/1074
+DietPi-Software | Home Assistant: Now available for installation. Many thanks to @sytone for adding this: https://github.com/Fourdee/DietPi/pull/1087
+DietPi-Software | Sabnzbd: Updated to 2.1.0 for new installations only: https://github.com/Fourdee/DietPi/issues/865#issuecomment-319110395
+DietPi-Software | Kodi: Now installs avahi-daemon by default: http://dietpi.com/phpbb/viewtopic.php?f=11&t=2148&p=8323#p8316
+DietPi-Software | sabnzbd: Updated to latest version (2.2.1), existing installations will need to uninstall/reinstall to update: https://github.com/Fourdee/DietPi/issues/865#issuecomment-325454351
+
+Bug fixes:
+General | Auto Swapfile generation: Size is now set to "2048 - total memory" to prevent out of memory errors during Koel installations and in general. "1024 - total RAM" was previous. All systems will have swapfile regenerated during this patch, you can change this afterwards in dietpi-config > advanced options: https://github.com/Fourdee/DietPi/issues/1126
+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
+General | Fix error log on disabled IPv6 (thanks @MichaIng): https://github.com/Fourdee/DietPi/pull/1120/
+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-Config | Corrected firmware upgrade code for OrangePi devices: http://dietpi.com/phpbb/viewtopic.php?f=11&t=2149&p=8295#p8295
+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.
+DietPi-Software | Mopidy: Resolved an issue where the libary would fail to update. Many thanks to Sciamano: http://dietpi.com/phpbb/viewtopic.php?f=11&t=2112
+DietPi-Software | Emby: Resolved an issue where unavailable libjpeg8 packages from Jessie/Stretch, would cause this installation to fail: https://github.com/Fourdee/DietPi/issues/1128#issuecomment-326743471
+
+-----------------------------------------------------------------------------------------------------------
+
 v154
 (23/07/17)
 

PREP_SYSTEM_FOR_DIETPI.sh

@@ -49,10 +49,10 @@ _EOF_
 #+Meveric images
 rm /etc/apt/sources.list.d/deb-multimedia.list
 
-#Remove following Jessie
+#Remove following All
 apt-get clean
 apt-get update
-apt-get purge -y gpsd ppp libboost-iostreams* sgml-base xml-core usb-modeswitch* libpng* cpp-* cpp ntpdate bluez bluetooth rsync dialog dhcpcd5 libsqlite* lua5.1 netcat-* make makedev ncdu plymouth openresolv shared-mime-in* tcpd strace tasksel* wireless-* xdg-user-dirs triggerhappy python* v4l-utils traceroute xz-utils ucf xauth zlib1g-dev xml-core aptitude* avahi-daemon rsyslog logrotate man-db manpages vim vim-common vim-runtime vim-tiny mc mc-data
+apt-get purge -y jq xxd iperf3 gdisk gpsd ppp libboost-iostreams* sgml-base xml-core usb-modeswitch* libpng* cpp-* cpp ntpdate bluez bluetooth rsync dialog dhcpcd5 libsqlite* lua5.1 netcat-* make makedev ncdu plymouth openresolv shared-mime-in* tcpd strace tasksel* wireless-* xdg-user-dirs triggerhappy python* v4l-utils traceroute xz-utils ucf xauth zlib1g-dev xml-core aptitude* avahi-daemon rsyslog logrotate man-db manpages vim vim-common vim-runtime vim-tiny mc mc-data
 
 #+Desktop images (Mostly desktop packages, but apply to non-desktop images also):
 apt-get purge -y libpod-* libpeas-* isc-dhcp-server gnome-* fonts-dejavu* eject dnsmasq* dns-root-data colord-data libjasper* libjson* libwbclient* libwayland* golang-* libavahi* libtext* libweb* libpcsclite1 libxau6* libxc* dictionaries-* libgtk* miscfiles minicom lrzsz lxmenu-* x11-* zenity* yelp-*
@@ -110,6 +110,7 @@ chmod +x -R /boot
 userdel -f pi
 userdel -f test #armbian
 userdel -f odroid
+userdel -f rock64
 
 #Remove folders (now in finalise script)
 
@@ -345,13 +346,6 @@ timeout 10;
 retry 4;
 _EOF_
 
-#Add ipv6 flags DietPi uses to disable IPV6 if set.
-cat << _EOF_ >> /etc/sysctl.conf
-net.ipv6.conf.all.disable_ipv6 = 0
-net.ipv6.conf.default.disable_ipv6 = 0
-net.ipv6.conf.lo.disable_ipv6 = 0
-_EOF_
-
 #Hosts
 cat << _EOF_ > /etc/hosts
 127.0.0.1    localhost
@@ -464,6 +458,9 @@ LC_ALL=en_GB.UTF-8
 LANG=en_GB.UTF-8
 _EOF_
 
+#Prefer to use wlan/eth naming for networked devices (eg: stretch)
+ln -s /dev/null /etc/systemd/network/99-default.link
+
 
 #??? Native PC, add i386 support by default
 dpkg --add-architecture i386
@@ -474,7 +471,11 @@ echo -e "blacklist bmp085" > /etc/modprobe.d/bmp085.conf
 
 #??? Sparky SBC ONLY: Blacklist GPU and touch screen modules: https://github.com/Fourdee/DietPi/issues/699#issuecomment-271362441
 cat << _EOF_ > /etc/modprobe.d/disable_sparkysbc_touchscreen.conf
-blacklist ctp_gsl3680
+blacklist owl_camera
+blacklist gsensor_stk8313
+blacklist ctp_ft5x06
+blacklist gsensor_bma222
+blacklist gsensor_mir3da
 _EOF_
 
 cat << _EOF_ > /etc/modprobe.d/disable_sparkysbc_gpu.conf

boot_xu4.ini

@@ -12,9 +12,6 @@ setenv macaddr "00:1e:06:61:7a:72"
 # --------------------------------
 setenv bootrootfs "console=tty1 root=UUID=a4f12232-1670-43f4-8eca-49bfbe4d01ee rootwait ro fsck.repair=yes"
 
-# boot commands
-setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; fatload mmc 0:1 0x44000000 exynos5422-odroidxu4.dtb; bootz 0x40008000 0x42000000 0x44000000"
-
 # --- Screen Configuration for HDMI --- #
 setenv videoconfig "drm_kms_helper.edid_firmware=edid/1920x1080.bin"
 
@@ -117,8 +114,19 @@ setenv hdmi_tx_res      "0"
 
 setenv hdmi_phy_control "hdmi_tx_amp_lvl=${hdmi_tx_amp_lvl} hdmi_tx_lvl_ch0=${hdmi_tx_lvl_ch0} hdmi_tx_lvl_ch1=${hdmi_tx_lvl_ch1} hdmi_tx_lvl_ch2=${hdmi_tx_lvl_ch2} hdmi_tx_emp_lvl=${hdmi_tx_emp_lvl} hdmi_clk_amp_lvl=${hdmi_clk_amp_lvl} hdmi_tx_res=${hdmi_tx_res} HPD=${HPD} vout=${vout}"
 
+# Load kernel, initrd and dtb in that sequence
+fatload mmc 0:1 0x40008000 zImage
+fatload mmc 0:1 0x42000000 uInitrd
+fatload mmc 0:1 0x44000000 exynos5422-odroidxu3.dtb
+
+# set FDT address
+fdt addr 0x44000000
+
+if test "${cecenable}" = "false"; then fdt rm /cec@101B0000; fi
+if test "${disable_vu7}" = "false"; then setenv hid_quirks "usbhid.quirks=0x0eef:0x0005:0x0004"; fi
+
 # final boot args
-setenv bootargs "${bootrootfs} ${videoconfig} smsc95xx.macaddr=${macaddr} governor=${governor} ${hdmi_phy_control}"
-# drm.debug=0xff
+setenv bootargs "${bootrootfs} ${videoconfig} smsc95xx.macaddr=${macaddr} governor=${governor} ${hdmi_phy_control} ${hid_quirks}"
+# drm.debug=0xff"
 # Boot the board
-boot
+bootz 0x40008000 0x42000000 0x44000000

dietpi.txt

@@ -212,5 +212,8 @@ dietpi_nextcloud_username=admin
 gitbranch=master
 gitforkowner=Fourdee
 
+#Forces a partition resize + expansion of rootfs on next boot. (0=disabled, 1=enabled)
+fs_force_resize=0
+
 # - Max size of rootfs resize (%)
 rootfs_resize_limit=100

dietpi/.version

@@ -1 +1 @@
-154
+155

dietpi/boot

@@ -28,6 +28,8 @@
 	DISTRO=0
 	HW_CPUID=0
 
+	FS_FORCED_EXPANSION=$(cat /DietPi/dietpi.txt | grep -m1 '^fs_force_resize=' | sed 's/.*=//')
+
 	# -3 = first boot / -2 = partition / -1 = filesystem / 0 = run dietpi-software at login / 1 = completed
 	DIETPI_INSTALL_STAGE=$(cat /DietPi/dietpi/.install_stage)
 
@@ -92,10 +94,11 @@
 		fi
 	}
 
-	Partition_SD(){
+	FS_Partition(){
 
 		local rootfs_resize_limit=$(cat /DietPi/dietpi.txt | grep -m1 '^rootfs_resize_limit=' | sed 's/.*=//')
 
+		local target_partition=$(findmnt / -o source -n | sed 's/.*p//')
 		local target_dev=$(findmnt / -o source -n)
 
 		# - MMCBLK[0-9]p[0-9] scrape
@@ -112,17 +115,17 @@
 
 		if (( $rootfs_resize_limit < 100 )); then
 
-			parted -s $target_dev unit % resizepart 2 $rootfs_resize_limit% || parted $target_dev unit % resizepart 2 Yes $rootfs_resize_limit%
+			parted -s $target_dev unit % resizepart $target_partition $rootfs_resize_limit% || parted $target_dev unit % resizepart $target_partition Yes $rootfs_resize_limit%
 
 		else
 
 			cat << _EOF_ | fdisk $target_dev
 p
 d
-2
+$target_partition
 n
 p
-2
+$target_partition
 $(parted $target_dev -ms unit s p | grep ':ext4::;' | sed 's/:/ /g' | sed 's/s//g' | awk '{ print $2 }')
 
 p
@@ -134,7 +137,7 @@ _EOF_
 
 	}
 
-	Expand_SD(){
+	FS_Expand(){
 
 		#Resize RootFS to new partition size
 		local target_dev=$(findmnt / -o source -n)
@@ -381,16 +384,36 @@ _EOF_
 	# Init
 	Run_Init
 
+	#----------------------------------------------------------------
+	#Filesystem expansion only (eg: for pre-installed images)
+	if (( $FS_FORCED_EXPANSION == 1 )); then
+
+		FS_Partition
+
+		sed -i '/fs_force_resize=/c\fs_force_resize=2' /DietPi/dietpi.txt
+
+		reboot
+
 	#----------------------------------------------------------------
 	#Normal Boot
-	if (( $DIETPI_INSTALL_STAGE == 1 )); then
+	elif (( $DIETPI_INSTALL_STAGE == 1 )); then
+
+		if (( $FS_FORCED_EXPANSION == 2 )); then
+
+			FS_Expand
+
+			sed -i '/fs_force_resize=/c\fs_force_resize=0' /DietPi/dietpi.txt
+
+		fi
 
 		Wait_For_Valid_Network_Connection
 
 		if (( $( cat /DietPi/dietpi.txt | grep -ci -m1 '^dietpi_check_for_updates=1') )); then
+
 			#Check for DietPi updates (+thread)
 			echo -e "$(date) | +Thread: checking for DietPi-Updates" >> "$FP_LOGFILE"
 			/DietPi/dietpi/dietpi-update 2 &> /dev/null &
+
 		fi
 
 		/DietPi/dietpi/dietpi-banner 1
@@ -452,8 +475,7 @@ _EOF_
 
 		fi
 
-		echo -e " Expanding SD/Flash partition. Please wait..."
-		Partition_SD
+		FS_Partition
 
 		echo -2 > /DietPi/dietpi/.install_stage
 
@@ -464,7 +486,7 @@ _EOF_
 	elif (( $DIETPI_INSTALL_STAGE == -2 )); then
 
 		#Expand rootFS
-		Expand_SD
+		FS_Expand
 		echo -1 > /DietPi/dietpi/.install_stage
 
 		#Enable/Create swapfile.

dietpi/dietpi-backup

@@ -113,7 +113,7 @@
 
 				;;
 				Help)
-					whiptail --title "DietPi-Backup Help" --msgbox "DietPi-Backup is a program that allows you to Backup and Restore your DietPi system.\n\nIf you have broken your system, or want to reset your system to an eariler date, this can all be done with DietPi-Backup.\n\nSimply choose a location where you want to save and restore your backups from, then, select Backup or Restore.\n\nMore information:\n - http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=256#p255" --backtitle "$WHIP_BACKTITLE" 20 75
+					whiptail --title "DietPi-Backup Help" --msgbox "DietPi-Backup is a program that allows you to Backup and Restore your DietPi system.\n\nIf you have broken your system, or want to reset your system to an earlier date, this can all be done with DietPi-Backup.\n\nSimply choose a location where you want to save and restore your backups from, then, select Backup or Restore.\n\nMore information:\n - http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=256#p255" --backtitle "$WHIP_BACKTITLE" 20 75
 				;;
 				Backup)
 					WHIP_TITLE=' Start backup? '

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")