Merge pull request #521 from Fourdee/testing

v131 (20/09/16) New Image: OrangePi One | Is now available. Implementation possible, with thanks to K-Plan: http://dietpi.com/download New Features: DietPi-Drive_Manager | Lightweight Drive Manager (eg: gparted). Allows you to mount, dismount, format EXT4/NTFS/FAT32/HFS+/BTRFS, toggle UUID mounting and control multiple (max 5) external/USB drives, for use on your DietPi system: https://github.com/Fourdee/DietPi/issues/271 Changes / Improvements / Optimizations: DietPi-Software | Added installation options for NFS server and client: https://github.com/Fourdee/DietPi/issues/246 DietPi-Software | Added installation options for UrBackup Server: https://github.com/Fourdee/DietPi/issues/494 DietPi-Software | CertBot will now automatically install required packages, rather than prompt user. DietPi-Software | Emby Media Server is now available for BPi M2+ BPi Pro and OPi PC. Thanks to John for testing with his BPi Pro (M1): http://dietpi.com/phpbb/viewtopic.php?f=11&t=644&p=2860#p2853 DietPi-Config | Added ability to mount NFS shares in Networking: NAS menu. Raspberry Pi | Image download updated to v131: http://dietpi.com/download Raspberry Pi | Image v131. We have changed from the unstable, unreliable and slow Raspbian Mirror Director, to Oxford UK Mirror: https://github.com/Fourdee/DietPi/issues/518. Requires v131 image or higher. General | When inserting one USB drive to system, it will be mounted automaticaly to /mnt/usb_1 when plugged in: https://github.com/Fourdee/DietPi/issues/501 General | Dedicated USB drive setup will now set the UUID in /etc/fstab General | HFS+ filesystem is now supported on all DietPi images. General | You can now check bootup time duration, by running 'cat /var/log/boottime'. This is the duration from boot, to when SystemD has finished. TIP: Boot times can vastly be reduced, by using a static IP address. DietPi-Lets_Encrypt | Now supports Apache2 and Lighttpd webserver stacks: https://github.com/Fourdee/DietPi/issues/479. Many thanks to aar0nism for posting a excellent guide we based this on: http://dietpi.com/phpbb/viewtopic.php?f=9&t=603&p=2625#p2624 Bug fixes: DietPi-Software | Resolved an issue where FFMPEG did not install libmp3lame0 on RPi 1. Many thanks to Erayan for reporting this: https://github.com/Fourdee/DietPi/issues/511 DietPi-Software | Automatic moving of user data is now limited to 1st run installation only. DietPi-Config | Resolved an issue where static IP WiFi connections failed to route data: https://github.com/Fourdee/DietPi/issues/515 DietPi-Cloudshell | Resolved an issue where the Storage scene would hang, if a unavailable NFS mount was used as custom USB device. Many thanks to John for reporting and testing this: https://github.com/Fourdee/DietPi/issues/395 DietPi-Automation | Resolved an issue where connection tests would not wait 1 second, before trying again. This occured when there was no available network. Image | We have found a possible image/filesystem corruption on our Odroid C2 image. The image has been reverted back to a previous stable image and updated to v130: https://github.com/Fourdee/DietPi/issues/507 General | Resolved an issue where setting snd-bcm2835 soundcard did not set avoid_pwm_pll=0 (to allow HQ audio).
MichaIng · Sep 20, 2016 · 045644f · 045644f
2 parents a29279f + 4c4a3d9
commit 045644f
Show file tree

Hide file tree

Showing 31 changed files with 1,998 additions and 707 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,37 @@
+v131
+(20/09/16)
+
+New Image:
+OrangePi One | Is now available. Implimentation possible, with thanks to K-Plan: http://dietpi.com/download
+
+New Features:
+DietPi-Drive_Manager | Lightweight Drive Manager (eg: gparted). Allows you to mount, dismount, format EXT4/NTFS/FAT32/HFS+/BTRFS, toggle UUID mounting and control multiple (max 5) external/USB drives, for use on your DietPi system: https://github.com/Fourdee/DietPi/issues/271
+
+Changes / Improvements / Optimizations:
+DietPi-Software | Added installation options for NFS server and client: https://github.com/Fourdee/DietPi/issues/246
+DietPi-Software | Added installation options for UrBackup Server: https://github.com/Fourdee/DietPi/issues/494
+DietPi-Software | CertBot will now automatically install required packages, rather than prompt user.
+DietPi-Software | Emby Media Server is now available for BPi M2+ BPi Pro and OPi PC. Thanks to John for testing with his BPi Pro (M1): http://dietpi.com/phpbb/viewtopic.php?f=11&t=644&p=2860#p2853
+DietPi-Config | Added ability to mount NFS shares in Networking: NAS menu.
+Raspberry Pi | Image download updated to v131: http://dietpi.com/download
+Raspberry Pi | Image v131. We have changed from the unstable, unreliable and slow Raspbian Mirror Director, to Oxford UK Mirror: https://github.com/Fourdee/DietPi/issues/518. Requires v131 image or higher.
+General | When inserting one USB drive to system, it will be mounted automaticaly to /mnt/usb_1 when plugged in: https://github.com/Fourdee/DietPi/issues/501
+General | Dedicated USB drive setup will now set the UUID in /etc/fstab
+General | HFS+ filesystem is now supported on all DietPi images.
+General | You can now check bootup time duration, by running 'cat /var/log/boottime'. This is the duration from boot, to when SystemD has finished. TIP: Boot times can vastly be reduced, by using a static IP address.
+DietPi-Lets_Encrypt | Now supports Apache2 and Lighttpd webserver stacks: https://github.com/Fourdee/DietPi/issues/479. Many thanks to aar0nism for posting a excellent guide we based this on: http://dietpi.com/phpbb/viewtopic.php?f=9&t=603&p=2625#p2624
+
+Bug fixes:
+DietPi-Software | Resolved an issue where FFMPEG did not install libmp3lame0 on RPi 1. Many thanks to Erayan for reporting this: https://github.com/Fourdee/DietPi/issues/511
+DietPi-Software | Automatic moving of user data is now limited to 1st run installation only.
+DietPi-Config | Resolved an issue where static IP WiFi connections failed to route data: https://github.com/Fourdee/DietPi/issues/515
+DietPi-Cloudshell | Resolved an issue where the Storage scene would hang, if a unavailable NFS mount was used as custom USB device. Many thanks to John for reporting and testing this: https://github.com/Fourdee/DietPi/issues/395
+DietPi-Automation | Resolved an issue where connection tests would not wait 1 second, before trying again. This occured when there was no available network.
+Image | We have found a possible image/filesystem corruption on our Odroid C2 image. The image has been reverted back to a previous stable image and updated to v130: https://github.com/Fourdee/DietPi/issues/507
+General | Resolved an issue where setting snd-bcm2835 soundcard did not set avoid_pwm_pll=0 (to allow HQ audio).
+
+-----------------------------------------------------------------------------------------------------------
+
 v130
 (06/09/16)
 

diff --git a/PREP_SYSTEM_FOR_DIETPI.sh b/PREP_SYSTEM_FOR_DIETPI.sh
@@ -15,6 +15,11 @@
 #  - Sections with '#???', are optional, depending on the device and its specs. (eg: does it need bluetooth?)
 #------------------------------------------------------------------------------------------------
 
+
+#------------------------------------------------------------------------------------------------
+#Packages
+#------------------------------------------------------------------------------------------------
+
 #Jessie , unified apt sources.
 rm /etc/apt/sources.list.d/deb-multimedia.list
 
@@ -57,7 +62,7 @@ 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
 
-# - Everything else (not including RPi)
+# - Everything else (excluding RPi!)
 cat << _EOF_ > /etc/apt/sources.list
 deb http://ftp.debian.org/debian jessie main contrib non-free
 deb http://ftp.debian.org/debian jessie-updates main contrib non-free
@@ -66,16 +71,16 @@ 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 -------------------------
-# 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_
+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 -------------------------
 
 
 #Remove following Jessie
 apt-get clean
 apt-get update
-apt-get purge 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
+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:
 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-*
@@ -84,52 +89,64 @@ apt-get purge libpod-* libpeas-* isc-dhcp-server gnome-* fonts-dejavu* eject dns
 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/*
 
 
 #+ dev packages
-apt-get purge '\-dev$'
-apt-get purge linux-headers*
+apt-get purge '\-dev$' linux-headers*
 
 
 apt-get autoremove --purge -y
 
 
-#install
+#install packages
 echo -e "CONF_SWAPSIZE=0" > /etc/dphys-swapfile
-apt-get install -y 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 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
 
+#FOURDEE: apt-get install pi-bluetooth #for desktop in dietpi-software?
+
 #firmware
 apt-get install -y firmware-realtek firmware-ralink firmware-brcm80211 firmware-atheros -y --no-install-recommends
 
+#------------------------------------------------------------------------------------------------
+#DIETPI STUFF
+#------------------------------------------------------------------------------------------------
+
 #Delete any non-root user (eg: pi)
 userdel -f pi
 
 #Remove folders
 rm -R /home
 rm -R /media
 rm -R /tmp/*
+rm -R /selinux
 
-#DIETPI STUFF
-#Create folders
+#Create DietPi common folders
 mkdir /DietPi
+
 mkdir -p /mnt/dietpi_userdata
+
 mkdir -p /mnt/usb_1
+
 mkdir -p /mnt/samba
 mkdir -p /mnt/ftp_client
-echo -e "Samba client can be installed and setup by DietPi-Config.\nSimply run: dietpi-config" > /mnt/samba/readme.txt
-echo -e "FTP client mount can be installed and setup by DietPi-Config.\nSimply run: dietpi-config" > /mnt/ftp_client/readme.txt
+mkdir -p /mnt/nfs_client
+echo -e "Samba client can be installed and setup by DietPi-Config.\nSimply run: dietpi-config and select the Networking Options: NAS/Misc menu" > /mnt/samba/readme.txt
+echo -e "FTP client mount can be installed and setup by DietPi-Config.\nSimply run: dietpi-config and select the Networking Options: NAS/Misc menu" > /mnt/ftp_client/readme.txt
+echo -e "NFS client can be installed and setup by DietPi-Config.\nSimply run: dietpi-config and select the Networking Options: NAS/Misc menu" > /mnt/nfs_client/readme.txt
 
 /boot/dietpi/dietpi-logclear 2
 
 #FSTAB
-# - Check if /boot is vfat. If not, change fstab accordingly
-blkid | grep '/dev/mmcblk0p1'
 cp /boot/dietpi/conf/fstab /etc/fstab
 
 #setup dietpi service
@@ -165,10 +182,10 @@ rm /etc/init.d/ntp &> /dev/null
 #/etc/sysctl.conf | Check for a previous entry before adding this
 echo -e "vm.swappiness=1" >> /etc/sysctl.conf
 
-#----------------------------------------------------
 #rc.local
 cat << _EOF_ > /etc/rc.local
 #!/bin/bash
+echo -e "\$(cat /proc/uptime | awk '{print \$1}') Seconds" > /var/log/boottime
 if (( \$(cat /DietPi/dietpi/.install_stage) == 1 )); then
 
     /DietPi/dietpi/dietpi-services start
@@ -250,6 +267,7 @@ alias dietpi-services='/DietPi/dietpi/dietpi-services'
 alias dietpi-config='/DietPi/dietpi/dietpi-config'
 alias dietpi-software='/DietPi/dietpi/dietpi-software'
 alias dietpi-update='/DietPi/dietpi/dietpi-update'
+alias dietpi-drive_manager='/DietPi/dietpi/dietpi-drive_manager'
 alias emulationstation='/opt/retropie/supplementary/emulationstation/emulationstation'
 alias opentyrian='/usr/local/games/opentyrian/run'
 
@@ -286,7 +304,6 @@ echo -e "options 8188eu rtw_power_mgnt=0" > /etc/modprobe.d/8188eu.conf
 #Set swapfile size
 echo -e "CONF_SWAPSIZE=0" > /etc/dphys-swapfile
 
-#--------SYSTEMD---------
 #nano /etc/systemd/logind.conf
 #NAutoVTs=1
 
@@ -339,9 +356,9 @@ systemctl enable kill-ssh-user-sessions-before-network
 systemctl daemon-reload
 
 
-dpkg-reconfigure tzdata
+dpkg-reconfigure tzdata #Europe > London
 dpkg-reconfigure keyboard-configuration #Keyboard must be plugged in for this to work!
-dpkg-reconfigure locales
+dpkg-reconfigure locales # en_GB.UTF8 as default and only installed locale
 
 #??? RPI ONLY: Scroll lock fix for RPi by Midwan: https://github.com/Fourdee/DietPi/issues/474#issuecomment-243215674
 cat << _EOF_ > /etc/udev/rules.d/50-leds.rules

diff --git a/dietpi.txt b/dietpi.txt
@@ -116,17 +116,20 @@ cpu_ondemand_sampling_rate=25000
 #sampling rate * down factor / 1000 = Miliseconds (40 = 1000ms when sampling rate is 25000)
 cpu_ondemand_sampling_down_factor=80
 
-#Samba Client Details (Used by DietPi-Config | Networking | Samba Client)
+#Samba Client Details (Used by DietPi-Config | Networking NAS | Samba Client)
 SambaClient_ComputerName=computername
 SambaClient_ShareName=sharename
 SambaClient_Username=username
 SambaClient_Password=password
 
-#FTP Client Filesystem Mount (CurlFtpFs) Details (Used by DietPi-Config | Networking | FTP Client)
+#FTP Client Filesystem Mount (CurlFtpFs) (Used by DietPi-Config | Networking NAS | FTP Client)
 curlftpfs_clientaddress=192.168.0.100
 curlftpfs_clientusername=username
 curlftpfs_clientpassword=password
 
+#NFS Client Filesystem Mount (Used by DietPi-Config | Networking NAS | NFS Client)
+nfsclient_ipaddress=
+
 #Proxy settings | System-wide proxy settings. Use dietpi-config > networking options to apply.
 proxy_enabled=0
 proxy_address=MyProxyServer.com
@@ -147,7 +150,7 @@ wifi_hotspot_key=dietpihotspot
 wifi_hotspot_channel=3
 
 #WiFi country code. 2 character value (eg GB US DE JP): https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
-wifi_country_code=
+wifi_country_code=GB
 
 #Serial Console: Set to 1 if you require a serial console during 1st run of DietPi.
 serial_console_enabled=0

diff --git a/dietpi/.version b/dietpi/.version
@@ -1 +1 @@
-130
+131
diff --git a/dietpi/conf/desktop/.gtk-bookmarks b/dietpi/conf/desktop/.gtk-bookmarks
@@ -3,4 +3,5 @@ file:///root /root
 file:///mnt/dietpi_userdata DietPi User Data
 file:///mnt/usb_1 USB Drive
 file:///mnt/samba Samba Client
-file:///mnt/ftp_client FTP Client
+file:///mnt/ftp_client FTP Client
+file:///mnt/nfs_client NFS Client
diff --git a/dietpi/conf/fstab b/dietpi/conf/fstab
@@ -1,19 +1,24 @@
 #Internal Drives---------------------------------------------------
 proc            /proc           proc    defaults											0 0
-/dev/mmcblk0p1  /boot           vfat    defaults,noatime,discard							0 2
-/dev/mmcblk0p2  /               ext4    defaults,noatime,discard							0 1
+/dev/mmcblk0p1  /boot           auto    defaults,noatime,discard							0 2
+/dev/mmcblk0p2  /               auto    defaults,noatime,discard							0 1
 tmpfs 			/tmp  			tmpfs 	defaults,noatime,nodev,nosuid,mode=1777				0 0
 tmpfs 			/var/log 		tmpfs 	defaults,size=20m,noatime,nodev,nosuid,mode=1777	0 0
 tmpfs 			/DietPi 		tmpfs 	defaults,size=10m,noatime,nodev,nosuid,mode=1777	0 0
 
 #External Drives---------------------------------------------------
-# - Try and use only ext4 for USB drives
-# - Faster performance than NTFS, espically on RPi v1
-#/dev/sda1       /mnt/usb_1      ext4    defaults,noatime,nofail  0       0
-#/dev/sda1       /mnt/usb_1      ntfs-3g    defaults,permissions,noatime,nofail       0       0
+#NB: Please use dietpi-drive_manager to setup and control your external drives.
+/dev/sda1       /mnt/usb_1      auto     defaults,noatime,nofail,x-systemd.automount  0       0
+#/dev/sdb1       /mnt/usb_2      auto     defaults,noatime,nofail,x-systemd.automount  0       0
+#/dev/sdc1       /mnt/usb_3      auto     defaults,noatime,nofail,x-systemd.automount  0       0
+#/dev/sdd1       /mnt/usb_4      auto     defaults,noatime,nofail,x-systemd.automount  0       0
+#/dev/sde1       /mnt/usb_5      auto     defaults,noatime,nofail,x-systemd.automount  0       0
 
 #Samba Client------------------------------------------------------
-#/mnt/samba . Please use dietpi-config and the networking menu to setup this mount
+#/mnt/samba . Please use dietpi-config and the Networking Options: NAS menu to setup this mount
 
 #FTP Client Mount--------------------------------------------------
-#/mnt/ftp_client . Please use dietpi-config and the networking menu to setup this mount
+#/mnt/ftp_client . Please use dietpi-config and the Networking Options: NAS menu to setup this mount
+
+#NFS Client Mount--------------------------------------------------
+#/mnt/nfs_client . Please use dietpi-config and the Networking Options: NAS menu to setup this mount
diff --git a/dietpi/conf/vsftpd.conf b/dietpi/conf/vsftpd.conf
@@ -1,7 +1,7 @@
 userlist_deny=YES
-local_root=/root
+local_root=/mnt/dietpi_userdata
 listen=YES
-listen_ipv6=YES
+listen_ipv6=NO
 anonymous_enable=NO
 local_enable=YES
 write_enable=YES

diff --git a/dietpi/dietpi-backup b/dietpi/dietpi-backup
@@ -157,13 +157,13 @@
 					Input_User_Directory
 				;;
 				"USB HDD")
-					if (( $USB_DRIVE_AVAILABLE == 1 )); then
+					if (( $USB_DRIVE_AVAILABLE )); then
 						FP_TARGET="$FP_USB_HDD"
 					else
 						whiptail --title "No USB HDD Found. Setup Now?" --yesno "$USB_DRIVE_TEXT\n\nWould you like DietPi to setup an external USB drive now?" --yes-button "Ok" --no-button "Back" --defaultno --backtitle "$WHIP_BACKTITLE" 11 65
 						CHOICE=$?
 						if (( $CHOICE == 0 )); then
-							/DietPi/dietpi/dietpi-external_drive_setup
+							/DietPi/dietpi/dietpi-drive_manager 2
 						fi
 
 					fi
@@ -201,7 +201,7 @@
 		/DietPi/dietpi/func/dietpi-notify 1 "Filesystem not supported in $FP_TARGET"
 
 		if (( $INPUT == 0 )); then
-			whiptail --title "Error" --msgbox "$FP_TARGET\n\nHas a filesystem of: $TARGET_FILESYSTEM_TYPE, and is not supported.\nThe filesystem must be ext (ext2,3,4)." --backtitle "$WHIP_BACKTITLE" 11 70
+			whiptail --title "Error" --msgbox "$FP_TARGET Has a filesystem of: $TARGET_FILESYSTEM_TYPE, and is not supported.\n\nThe filesystem must be EXT2/3/4 for symlink compatibility." --backtitle "$WHIP_BACKTITLE" 11 70
 		fi
 
 	}
@@ -498,7 +498,7 @@
 		#USB
 		USB_DRIVE_AVAILABLE=0
 		USB_DRIVE_TEXT="No USB HDD was found or mounted (/mnt/usb_1)."
-		if (( $(cat "$temp_file_mounts" | grep -ci -m1 "/mnt/usb_1") == 1 )); then
+		if (( $(cat "$temp_file_mounts" | grep -ci -m1 "/mnt/usb_1") )); then
 			USB_DRIVE_AVAILABLE=1
 			USB_DRIVE_TEXT="Size: $(df -h | grep /mnt/usb_1 | awk '{print $2}')B | Available: $(df -h | grep /mnt/usb_1 | awk '{print $4}')B"
 		fi
@@ -567,8 +567,10 @@
 			FP_TARGET=$(sed -n 1p "$FP_DIETPIBACKUP_SETTINGS")
 
 		#First Run > Assign USB drive as target if available
-		elif (( $(df -h | grep -ci -m1 '/mnt/usb_1') == 1 )); then
-			FP_TARGET=$FP_USB_HDD
+		elif (( $(df -h | grep -ci -m1 '/mnt/usb_1') )); then
+
+			FP_TARGET="$FP_USB_HDD"
+
 		fi
 
 	}

diff --git a/dietpi/dietpi-banner b/dietpi/dietpi-banner
@@ -106,8 +106,9 @@
 	Credits_Print(){
 		echo -e ""
 		echo -e "\e[90m Created by : Daniel Knight\e[0m"
-		echo -e "\e[90m Web        : DietPi.com\e[0m"
-		echo -e "\e[90m Twitter    : twitter.com/dietpi_\e[0m"
+		echo -e "\e[90m Web        : http://DietPi.com\e[0m"
+		echo -e "\e[90m Twitter    : http://twitter.com/dietpi_\e[0m"
+		echo -e "\e[90m Donate     : http://goo.gl/pzISt9 \e[0m"
 
 		if [ -n "$IMAGE_ADDITIONAL_CREDITS" ]; then
 
@@ -118,8 +119,6 @@
 
 		echo -e "\e[90m DietPi's web hosting is powered by: MyVirtualServer.com\e[0m"
 		echo -e ""
-		echo -e "\e[90m DietPi relies on your donations for funding: http://goo.gl/pzISt9\e[0m"
-		echo -e ""
 		echo -e "\e[1m dietpi-launcher\e[0m  = All the DietPi programs in one place."
 		echo -e "\e[1m dietpi-config\e[0m    = Feature rich configuration tool for your device."
 		echo -e "\e[1m dietpi-software\e[0m  = Select optimized software for installation."

diff --git a/dietpi/dietpi-bugreport b/dietpi/dietpi-bugreport
@@ -173,8 +173,8 @@ _EOF_
 		do
 
 			${acommand_list[$i]} > command_output_$i.txt
-			zip -r "$zip_settings" "$FILE_GENERATED_ZIP" command_output_$i
-			rm command_output_$i
+			zip -r "$zip_settings" "$FILE_GENERATED_ZIP" command_output_$i.txt
+			rm command_output_$i.txt
 
 		done