Merge pull request #549 from Fourdee/testing

v133
(08/10/16)

Changes / Improvements / Optimizations:

DietPi-Software | Added installation option for Webmin: http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=3047#p3047

DietPi-Software | Libcec3 now installed with Kodi by default: https://github.com/Fourdee/DietPi/issues/283

DietPi-Software | Emby is now available for ARM64 devices. Many thanks to Gabriel for making this possible: http://dietpi.com/phpbb/viewtopic.php?f=11&t=720&p=3120#p3117

DietPi-Software | Urbackup server installation updated to 2.0.36.

DietPi-Config | You can now change Apt mirrors from the "Networking NAS/Misc menu": https://github.com/Fourdee/DietPi/issues/519

DietPi-Config | Added ability to tweak Ondemand sampling rates in the performance menu: https://github.com/Fourdee/DietPi/issues/541

DietPi-Drive_Manager | To support large filesystems, GPT is now the default paritition table type on format, (previously MBR). Many thanks to Zone22: https://github.com/Fourdee/DietPi/issues/531

DietPi-Drive_Manager | Current userdata location is now shown in the main menu.

DietPi-Set_Cpu | If the target CPU gov is not available on the system, an alternative will be set and saved automatically.

DietPi-Automation | Added a global password var (AUTO_Global_Password=) in dietpi.txt, which will be applied to root login, and, during dietpi-software installations, for all software that use a password: https://github.com/Fourdee/DietPi/issues/533

DietPi-Automation | Added filesystem format type for USB drive format (AUTO_Dedicated_Usb_Drive_Format_Filesystem=) in dietpi.txt: https://github.com/Fourdee/DietPi/issues/537

DietPi-Automation | Added ability to force ethernet link speeds on 1st run (Ethernet_Force_Speed=) in dietpi.txt: https://github.com/Fourdee/DietPi/issues/544#issuecomment-252068249

General | Interactive is now the default CPU gov, provides improved response times: https://github.com/Fourdee/DietPi/issues/535

General | Ethtool is now installed by default. Mainly used to provide a workaround for known HW failure Pine A64 1Gbit boards: https://github.com/Fourdee/DietPi/issues/544#issuecomment-252068249

Bug fixes:

DietPi-Software | Emby has been disabled for ARMv6 devices, due to unsupported/broken repo on armv6 hardware: https://github.com/Fourdee/DietPi/issues/534

DietPi-Software | Resolved an issue where Nginx would prevent file uploads over 2MB. Many thanks to @pfeerick for reporting this and providing the solution: https://github.com/Fourdee/DietPi/issues/546

DietPi-Services | Resolved an issue where Samba services smbd and nmbd, were not being applied. Many thanks to RajatNair: https://github.com/Fourdee/DietPi/issues/542

DietPi-Config | Resolved an issue where NanoPiM2 was allowing H3 soundcards to be set.
General | Improved detection for RPi boards with warranty bit set.

CHANGELOG.txt

@@ -1,3 +1,31 @@
+v133
+(08/10/16)
+
+Changes / Improvements / Optimizations:
+DietPi-Software | Added installation option for Webmin: http://dietpi.com/phpbb/viewtopic.php?f=8&t=5&p=3047#p3047
+DietPi-Software | Libcec3 now installed with Kodi by default: https://github.com/Fourdee/DietPi/issues/283
+DietPi-Software | Emby is now available for ARM64 devices. Many thanks to Gabriel for making this possible: http://dietpi.com/phpbb/viewtopic.php?f=11&t=720&p=3120#p3117
+DietPi-Software | Urbackup server installation updated to 2.0.36.
+DietPi-Config | You can now change Apt mirrors from the "Networking NAS/Misc menu": https://github.com/Fourdee/DietPi/issues/519
+DietPi-Config | Added ability to tweak Ondemand sampling rates in the performance menu: https://github.com/Fourdee/DietPi/issues/541
+DietPi-Drive_Manager | To support large filesystems, GPT is now the default paritition table type on format, (previously MBR). Many thanks to Zone22: https://github.com/Fourdee/DietPi/issues/531
+DietPi-Drive_Manager | Current userdata location is now shown in the main menu.
+DietPi-Set_Cpu | If the target CPU gov is not available on the system, an alternative will be set and saved automatically.
+DietPi-Automation | Added a global password var (AUTO_Global_Password=) in dietpi.txt, which will be applied to root login, and, during dietpi-software installations, for all software that use a password: https://github.com/Fourdee/DietPi/issues/533
+DietPi-Automation | Added filesystem format type for USB drive format (AUTO_Dedicated_Usb_Drive_Format_Filesystem=) in dietpi.txt: https://github.com/Fourdee/DietPi/issues/537
+DietPi-Automation | Added ability to force ethernet link speeds on 1st run (Ethernet_Force_Speed=) in dietpi.txt: https://github.com/Fourdee/DietPi/issues/544#issuecomment-252068249
+General | Interactive is now the default CPU gov, provides improved response times: https://github.com/Fourdee/DietPi/issues/535
+General | Ethtool is now installed by default. Mainly used to provide a workaround for known HW failure Pine A64 1Gbit boards: https://github.com/Fourdee/DietPi/issues/544#issuecomment-252068249
+
+Bug fixes:
+DietPi-Software | Emby has been disabled for ARMv6 devices, due to unsupported/broken repo on armv6 hardware: https://github.com/Fourdee/DietPi/issues/534
+DietPi-Software | Resolved an issue where Nginx would prevent file uploads over 2MB. Many thanks to @pfeerick for reporting this and providing the solution: https://github.com/Fourdee/DietPi/issues/546
+DietPi-Services | Resolved an issue where Samba services smbd and nmbd, were not being applied. Many thanks to RajatNair: https://github.com/Fourdee/DietPi/issues/542
+DietPi-Config | Resolved an issue where NanoPiM2 was allowing H3 soundcards to be set.
+General | Improved detection for RPi boards with warranty bit set.
+
+-----------------------------------------------------------------------------------------------------------
+
 v132
 (25/09/16)
 
@@ -10,7 +38,7 @@ DietPi-Software | Cleaned up the default samba server config. Many thanks to Acr
 DietPi-Software | Php max upload size is now set automatically to the max capable on your device. Generally, 2GB for 32bit systems, 8796PB for 64bit systems. Used by programs such as Nextcloud.
 DietPi-Software | UrBackup installation updated to 2.0.34.
 DietPi-Update | Added a notice prior to update, with regards to: manually edited Linux configurations possibily affecting the update: https://github.com/Fourdee/DietPi/issues/525
-DietPi-Drive_Manager | Added root FS (SD/EMMC) to list of drives, and an option to move userdata their also.
+DietPi-Drive_Manager | Added root FS (SD/EMMC) to list of drives, and option to move userdata there also.
 General | p7zip is now installed by default.
 
 Bug fixes:

PREP_SYSTEM_FOR_DIETPI.sh

@@ -62,6 +62,10 @@ rm /etc/apt/sources.list.d/deb-multimedia.list
 # deb-src http://ftp.debian.org/debian jessie-backports main contrib non-free
 # deb-src http://ftp.debian.org/debian jessie-proposed-updates contrib non-free main
 
+
+#NOTE:
+#Apt mirror will get overwritten by: /DietPi/dietpi/func/dietpi-set_software apt-mirror default : during finalize.
+
 # - Everything else (excluding RPi!)
 cat << _EOF_ > /etc/apt/sources.list
 deb http://ftp.debian.org/debian jessie main contrib non-free
@@ -70,33 +74,32 @@ deb http://security.debian.org jessie/updates main contrib non-free
 deb http://ftp.debian.org/debian jessie-backports main contrib non-free
 _EOF_
 
-# RPI UK for my testing, mirror director is slow, unstable and unreliable -------------------------
+# RPI UK mirror director is slow, unstable and unreliable -------------------------
 cat << _EOF_ > /etc/apt/sources.list
 deb http://mirror.ox.ac.uk/sites/archive.raspbian.org/archive/raspbian jessie main contrib non-free rpi
 _EOF_
-# RPI UK for my testing, mirror director is slow, unstable and unreliable -------------------------
+# RPI UK mirror director is slow, unstable and unreliable -------------------------
 
 
 #Remove following Jessie
 apt-get clean
 apt-get update
 apt-get purge libpng* cpp-* cpp ntpdate bluez bluetooth rsync dialog dhcpcd5 libsqlite* libxapian22 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:
+#+Desktop images (Mostly desktop packages, but apply to non-desktop images also):
 apt-get purge libpod-* libpeas-* isc-dhcp-server gnome-* fonts-dejavu* eject dnsmasq* dns-root-data colord-data libturbojpeg1 libjasper* libjson* libwbclient* libwayland* golang-* libavahi* libtext* libweb* libpcsclite1 libxau6* libvpx1 libxc* dictionaries-* libgtk* miscfiles minicom lrzsz lxmenu-* x11-* zenity* yelp-*
 
 #+armbian
 apt-get purge toilet toilet-fonts w-scan vlan weather-util* sysbench stress apt-transport-* cmake cmake-data device-tree-co* fping hddtemp haveged hostapd i2c-tools iperf ir-keytable libasound2* libmtp* libusb-dev lirc lsof ncurses-term pkg-config unicode-data rfkill pv mtp-tools m4 screen alsa-utils armbian-* autotools-dev bind9-host btrfs-tools bridge-utils cpufrequtils dvb-apps dtv-scan-table* evtest f3 figlet gcc gcc-4.8-* git git-man iozone3 ifenslave
 apt-get purge -y linux-jessie-root-*
 
-#+RPi
-apt-get purge libraspberrypi-doc
-
 #rm /etc/apt/sources.list.d/armbian.list
 rm /etc/init.d/resize2fs
 systemctl daemon-reload
 rm /etc/update-motd.d/*
 
+#+RPi
+apt-get purge libraspberrypi-doc
 
 #+ dev packages
 apt-get purge '\-dev$' linux-headers*
@@ -107,7 +110,7 @@ apt-get autoremove --purge -y
 
 #install packages
 echo -e "CONF_SWAPSIZE=0" > /etc/dphys-swapfile
-apt-get install -y p7zip-full hfsplus iw debconf-utils xz-utils ifmetric fbset wpasupplicant resolvconf bc dbus bzip2 psmisc bash-completion cron whiptail sudo ntp ntfs-3g dosfstools parted hdparm pciutils usbutils zip htop wput wget fake-hwclock dphys-swapfile curl unzip ca-certificates console-setup console-data console-common keyboard-configuration wireless-tools wireless-regdb crda --no-install-recommends
+apt-get install -y ethtool p7zip-full hfsplus iw debconf-utils xz-utils ifmetric fbset wpasupplicant resolvconf bc dbus bzip2 psmisc bash-completion cron whiptail sudo ntp ntfs-3g dosfstools parted hdparm pciutils usbutils zip htop wput wget fake-hwclock dphys-swapfile curl unzip ca-certificates console-setup console-data console-common keyboard-configuration wireless-tools wireless-regdb crda --no-install-recommends
 
 #??? bluetooth if onboard device
 apt-get install -y bluetooth
@@ -377,6 +380,9 @@ _EOF_
 #Finalise system
 /DietPi/dietpi/finalise
 
+#??? Does this device have a unique HW ID index and file? check /DietPi/dietpi/dietpi-obtain_hw_model
+echo ID > /etc/.dietpi_hw_model_identifier
+
 #Power off system
 
 #Read image

dietpi.txt

@@ -26,20 +26,35 @@ Static_DNS=8.8.8.8
 #Hostname
 Hostname=DietPi
 
+#Force ethernet speeds
+#NB: This is mainly aimed towards Pine A64's which may have a HW issue that causes unstable 1Gbit link.
+#	0=automatic speed | 10 = 10mbit, 100 = 100mbit etc
+Ethernet_Force_Speed=0
+
 # >> Misc Options -----------------------------------
 #Size of dphys-swapfile to generate (MB)
 #   0=Disabled.
 Swapfile_Size=100
 
 # >> Automation Options -----------------------------
+#NB: Following options are only executed on 1st run of DietPi.
+
+#Fully automate installation
 #   1=Automated installation with no user inputs.
 AUTO_Install_Enable=0
 
+#Global Password to be applied for the system
+#  Affects root login password, and, all software installed by dietpi-software, that requires a password
+#  eg: MySQL, Transmission, Deluge etc.
+#  WARN: Passwords with the any of the following characters are not supported: \"$
+#  WARN: Do NOT change this entry, after 1st run setup of DietPi has been completed. It is always scraped by dietpi-software.
+AUTO_Global_Password=dietpi
+
 #DietPi-Software to automatically install. | requires AUTO_Install_Enable=1
-#For a list of software index's (ID's), run '/DietPi/dietpi/dietpi-software list'
-#No limit on number entires, add as many as you need and uncomment the line.
-#DietPi will automatically install all pre-reqs (eg: ALSA/XSERVER for desktops etc)
-#	Examples:
+#	For a list of software index's (ID's), run '/DietPi/dietpi/dietpi-software list'
+#	No limit on number entires, add as many as you need and uncomment the line.
+#	DietPi will automatically install all pre-reqs (eg: ALSA/XSERVER for desktops etc)
+#	- Examples:
 #AUTO_DietpiSoftware_Install_ID=23 	#will install Desktop LXDE
 #AUTO_DietpiSoftware_Install_ID=74 	#will install LAMP webserver stack
 #AUTO_DietpiSoftware_Install_ID=44	#will install Bittorrent transmission
@@ -76,6 +91,10 @@ AUTO_DietpiSoftware_WebserverIndex=-2
 #	If the file exists, the USB drive will be formatted to ext4. (WARNING: ALL DATA ON /dev/sda WILL BE DELETED. YOU HAVE BEEN WARNED!).
 #   DietPi will configure your software installations to use your dedicated drive for personal data. (eg: owncloud data / bittorrent downloads etc)
 #   NB: Plug in 1 USB drive before powering on system. Use 1 USB drive ONLY.
+#eg: touch /boot/Automation_Format_My_Usb_Drive
+
+#	Format filesystem type | 0=ext4 1=ntfs 2=fat32 3=hfs+ 4=btrfs | requires /boot/Automation_Format_My_Usb_Drive
+AUTO_Dedicated_Usb_Drive_Format_Filesystem=0
 
 #DietPi-Autostart | Requires AUTO_Install_Enable=1
 #   After installation is completed, which program should the system boot to?
@@ -104,7 +123,7 @@ AUTO_CustomScriptURL=0
 rpi_hdmi_output=1
 
 #Cpu Governor | ondemand | powersave | performance | conservative
-cpu_governor=ondemand
+cpu_governor=interactive
 cpu_usage_throttle_up=50
 
 #Limit the max cpu frequency (Mhz) for all cores. | 0=disabled | Useful for lowering temp/power usage on your device.
@@ -164,6 +183,12 @@ lcdpanel=none
 #Prefer IPversion (for: apt-get) | auto (let system decide) / ipv4 (force) / ipv6 (force) | eg: force IPv4 with prefer_ipversion=ipv4
 prefer_ipversion=auto
 
+#Apt mirrors which are applied to /etc/apt/sources.list | Values here will also be applied during 1st run setup
+#	Raspbian = https://www.raspbian.org/RaspbianMirrors
+#	Debian = https://www.debian.org/mirror/official#list
+Apt_Raspbian_Mirror=http://mirror.ox.ac.uk/sites/archive.raspbian.org/archive/raspbian
+Apt_Debian_Mirror=http://ftp.debian.org/debian
+
 #------------------------------------------------------------------------------------------------------
 # D I E T - P I
 # DietPi-Software settings.
@@ -185,6 +210,9 @@ dietpi_vncserver_height=720
 dietpi_vncserver_depth=16
 dietpi_vncserver_display=1
 
+#Optional username for nextcloud admin account, default is admin. Applied during installation.
+dietpi_nextcloud_username=admin
+
 #------------------------------------------------------------------------------------------------------
 # D I E T - P I
 # Dev settings

dietpi/.version

@@ -1 +1 @@
-132
+133

dietpi/boot

@@ -207,6 +207,9 @@ _EOF_
 
 		fi
 
+		#Apply forced eth speed if set in dietpi.txt
+		/DietPi/dietpi/func/dietpi-set_hardware eth-forcespeed $(cat /DietPi/dietpi.txt | grep -m1 '^Ethernet_Force_Speed=' | sed 's/.*=//' )
+
 		#Wait for active connection, then update network details file
 		Wait_For_Valid_Network_Connection
 
@@ -339,20 +342,41 @@ _EOF_
 		#Set hostname
 		/DietPi/dietpi/func/change_hostname "$(cat /DietPi/dietpi.txt | grep -m1 '^Hostname=' | sed 's/.*=//')"
 
-		#Automation - Set auto login for next bootup
+		#Automation
+		# - Set auto login for next bootup
 		if (( $(cat /DietPi/dietpi.txt | grep -m1 '^AUTO_Install_Enable=' | sed 's/.*=//') >= 1 )); then
 
 			/DietPi/dietpi/dietpi-autostart 7
 
 		fi
 
-		#Enable serial console?
+		# - Enable serial console?
 		if (( $(cat /DietPi/dietpi.txt | grep -ci -m1 '^serial_console_enabled=1') )); then
 
 			/DietPi/dietpi/func/dietpi-set_hardware serialconsole enable
 
 		fi
 
+		# - Set root password?
+		root_password=$(cat /DietPi/dietpi.txt | grep -m1 '^AUTO_Global_Password=' | sed 's/.*=//')
+		if [ -n "$root_password" ]; then
+
+			chpasswd <<< "root:$root_password"
+
+		fi
+
+		# - Set apt mirror
+		if (( $HW_MODEL < 10 )); then
+
+			/DietPi/dietpi/func/dietpi-set_software apt-mirror $(cat /DietPi/dietpi.txt | grep -m1 '^Apt_Raspbian_Mirror=' | sed 's/.*=//')
+
+		else
+
+			/DietPi/dietpi/func/dietpi-set_software apt-mirror $(cat /DietPi/dietpi.txt | grep -m1 '^Apt_Debian_Mirror=' | sed 's/.*=//')
+
+		fi
+
+
 		echo -e " Expanding SD/Flash partition. Please wait..."
 		Partition_SD
 

dietpi/conf/network_interfaces

@@ -8,7 +8,6 @@ iface lo inet loopback
 # Ethernet
 #allow-hotplug eth0
 iface eth0 inet dhcp
-metric 0
 address 192.168.0.100
 netmask 255.255.255.0
 gateway 192.168.0.1
@@ -17,7 +16,6 @@ gateway 192.168.0.1
 # Wifi
 #allow-hotplug wlan0
 iface wlan0 inet dhcp
-metric 1
 address 192.168.0.100
 netmask 255.255.255.0
 gateway 192.168.0.1

dietpi/conf/nginx.conf

@@ -19,8 +19,12 @@ error_log /var/log/nginx/error.log;
 pid /run/nginx.pid;
 
 http {
+
     charset utf-8;
 
+	# + Nginx - To avoid 2MB upload error: https://github.com/Fourdee/DietPi/issues/546
+	client_max_body_size 2000M;
+
     # Upstream to abstract back-end connection(s) for PHP
     upstream php {
         server unix:/run/php5-fpm.sock;