Permalink
Browse files

Merge pull request #682 from Fourdee/testing

v141
(31/12/16)

Images:

NanoPi NEO | This image has been updated to kernel 4.9, appears more stable to 3.x. Also fixes a few issues relating to USB WiFi and i2c errors: #667

NanoPi NEO Air | This image has been updated to kernel 4.9, appears more stable to 3.x. Also fixes a few issues relating to onboard WiFi, USB WiFi and i2c errors. Many thanks to @zador-blood-stained at ARMbian to help make this possible: #640

Changes / Improvements / Optimizations:

DietPi-Software | Reduced the verbosity of onscreen text during apt installations.

DietPi-Software | PiHole: Web interface password is now set during install (default dietpi): #662

DietPi-Software | UrBackup Server: Updated to latest version (2.0.38). Applies to new installations only: #657

Bug fixes:

DietPi-Automation | Resolved an issue where static IPs were not being applied during 1st run dietpi-update stage. This fix applies to v140 and higher images: #660

DietPi-Software | Resolved an issue where the DietPi installed version of Chromium was being overwritten by Debian repo during dist-upgrade: #658

DietPi-Software | Resolved an issue where custom global password ('AUTO_Global_Password=') was not being used as MySQL login password, causing MySQL DB creations to fail: #666

DietPi-Software | Resolved an issue where LMS failed to installed on Odroid C2: #663

General | apt-transport-https: Is now installed by default on all devices. Required for https apt usage and resolves issues with apt simulation failing: #669
  • Loading branch information...
2 parents 4794c73 + 781a24f commit 5a001bd612000cae5462c1d04648320d3e2f8d92 @Fourdee committed on GitHub Dec 31, 2016
Showing with 213 additions and 23 deletions.
  1. +21 −0 CHANGELOG.txt
  2. +8 −4 PREP_SYSTEM_FOR_DIETPI.sh
  3. +1 −1 dietpi/.version
  4. +3 −0 dietpi/boot
  5. +25 −13 dietpi/dietpi-software
  6. +6 −1 dietpi/func/dietpi-set_hardware
  7. +148 −3 dietpi/patch_file
  8. +1 −1 dietpi/server_version
View
@@ -1,3 +1,24 @@
+v141
+(31/12/16)
+
+Images:
+NanoPi NEO | This image has been updated to kernel 4.9, appears more stable to 3.x. Also fixes a few issues relating to USB WiFi and i2c errors: https://github.com/Fourdee/DietPi/issues/667
+NanoPi NEO Air | This image has been updated to kernel 4.9, appears more stable to 3.x. Also fixes a few issues relating to onboard WiFi, USB WiFi and i2c errors. Many thanks to @zador-blood-stained at ARMbian to help make this possible: https://github.com/Fourdee/DietPi/issues/640
+
+Changes / Improvements / Optimizations:
+DietPi-Software | Reduced the verbosity of onscreen text during apt installations.
+DietPi-Software | PiHole: Web interface password is now set during install (default dietpi): https://github.com/Fourdee/DietPi/issues/662
+DietPi-Software | UrBackup Server: Updated to latest version (2.0.38). Applies to new installations only: https://github.com/Fourdee/DietPi/issues/657
+
+Bug fixes:
+DietPi-Automation | Resolved an issue where static IPs were not being applied during 1st run dietpi-update stage. This fix applies to v140 and higher images: https://github.com/Fourdee/DietPi/issues/660
+DietPi-Software | Resolved an issue where the DietPi installed version of Chromium was being overwritten by Debian repo during dist-upgrade: https://github.com/Fourdee/DietPi/issues/658
+DietPi-Software | Resolved an issue where custom global password ('AUTO_Global_Password=') was not being used as MySQL login password, causing MySQL DB creations to fail: https://github.com/Fourdee/DietPi/issues/666
+DietPi-Software | Resolved an issue where LMS failed to installed on Odroid C2: https://github.com/Fourdee/DietPi/issues/663
+General | apt-transport-https: Is now installed by default on all devices. Required for https apt usage and resolves issues with apt simulation failing: https://github.com/Fourdee/DietPi/issues/669
+
+-----------------------------------------------------------------------------------------------------------
+
v140
(21/12/16)
@@ -24,7 +24,6 @@ exit 0 #prevent continuation of this script.
#------------------------------------------------------------------------------------------------
#Jessie , unified apt sources.
-rm /etc/apt/sources.list.d/deb-multimedia.list
# - C2
# cat << _EOF_ > /etc/apt/sources.list
@@ -89,6 +88,9 @@ _EOF_
# #echo -e "deb http://archive.raspberrypi.org/debian/ stretch main ui" > /etc/apt/sources.list.d/raspi.list #Does not currently support Stretch
# RPI UK mirror director is slow, unstable and unreliable -------------------------
+#+Meveric images
+rm /etc/apt/sources.list.d/deb-multimedia.list
+
#Remove following Jessie
apt-get clean
apt-get update
@@ -99,7 +101,7 @@ apt-get purge libpod-* libpeas-* isc-dhcp-server gnome-* fonts-dejavu* eject dns
#+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 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-*
+#apt-get purge -y linux-jessie-root-*
#rm /etc/apt/sources.list.d/armbian.list
rm /etc/init.d/resize2fs
@@ -119,9 +121,9 @@ apt-get dist-upgrade -y
#install packages
echo -e "CONF_SWAPSIZE=0" > /etc/dphys-swapfile
-apt-get install -y 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 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 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 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
-#??? NanoPi Neo Air (and possibily other ap62xx chipsets), required for ap6212 bt firmware service: https://github.com/Fourdee/DietPi/issues/602#issuecomment-262806470
+#??? NanoPi Neo Air 3.x kernel only (and possibily other ap62xx chipsets), required for ap6212 bt firmware service: https://github.com/Fourdee/DietPi/issues/602#issuecomment-262806470
apt-get install rfkill
#??? bluetooth if onboard device
@@ -320,6 +322,8 @@ Dpkg::Options {
}
_EOF_
+#Stretch, disable automatic updates and management of apt cache. Prevents unexpected lock on Apt cache and therefore failed apt installations.
+systemctl mask apt-daily.service
#/etc/sysctl.conf | Check for a previous entry before adding this
echo -e "vm.swappiness=1" >> /etc/sysctl.conf
View
@@ -1 +1 @@
-140
+141
View
@@ -194,6 +194,9 @@ _EOF_
fi
+ #Kill dhclient, again: https://github.com/Fourdee/DietPi/issues/660
+ killall -w dhclient
+
#Restart Networking
systemctl daemon-reload
systemctl restart networking
@@ -2395,12 +2395,14 @@ _EOF_
local string="$@"
local force_options='--force-yes'
- #PHP7
+
# if (( $DISTRO == 4 )): then
# force_options='--allow'
# fi
- DEBIAN_FRONTEND=noninteractive apt-get install -y $force_options $string
+ #-qq can add a slight period of appearing nothing is happening, lets inform user
+ /DietPi/dietpi/func/dietpi-notify 2 "Apt-get is processing, please wait...\n"
+ DEBIAN_FRONTEND=noninteractive apt-get install -y -qq $force_options $string
local result=$?
if (( $result != 0 )); then
@@ -3403,16 +3405,16 @@ _EOF_
if (( $HW_ARCH == 21 )); then
- INSTALL_URL_ADDRESS="http://hndl.urbackup.org/Server/2.0.36/urbackup-server_2.0.36_amd64.deb"
+ INSTALL_URL_ADDRESS="http://hndl.urbackup.org/Server/2.0.38/urbackup-server_2.0.38_amd64.deb"
elif (( $HW_ARCH >= 1 && $HW_ARCH < 10 )); then
- INSTALL_URL_ADDRESS="http://hndl.urbackup.org/Server/2.0.36/urbackup-server_2.0.36_armhf.deb"
+ INSTALL_URL_ADDRESS="http://hndl.urbackup.org/Server/2.0.38/urbackup-server_2.0.38_armhf.deb"
#ARM64 sourcebuild
elif (( $HW_ARCH == 10 )); then
- INSTALL_URL_ADDRESS="http://hndl.urbackup.org/Server/2.0.36/urbackup-server-2.0.36.tar.gz"
+ INSTALL_URL_ADDRESS="http://hndl.urbackup.org/Server/2.0.38/urbackup-server-2.0.38.tar.gz"
fi
@@ -3998,6 +4000,9 @@ _EOF_
unset apackages
+ #Enable logging for NAA Daemon
+ #echo -e "NETWORKAUDIOD_LOGFILE='/var/log/naadaemon.log'" > /etc/default/networkaudiod
+
fi
#Tomcat8
@@ -5333,6 +5338,9 @@ _EOF_
rm package.deb
+ # - Prevent Debian repo from replacing our chromium packages: https://github.com/Fourdee/DietPi/issues/658
+ apt-mark hold chromium chromedriver
+
else
Error_NoConnection_NoInstall
@@ -6455,7 +6463,7 @@ _EOF_
fi
# - Create DB v11: https://github.com/Fourdee/DietPi/issues/647#issuecomment-267019815
- /DietPi/dietpi/func/create_mysql_db nextcloud dietpi root "$GLOBAL_PW"
+ /DietPi/dietpi/func/create_mysql_db nextcloud "$GLOBAL_PW" root "$GLOBAL_PW"
cd /var/www/nextcloud
sudo -u www-data php occ maintenance:install --no-interaction --database "mysql" --database-name "nextcloud" --database-user "root" --database-pass "$GLOBAL_PW" --admin-user "$username" --admin-pass "$GLOBAL_PW" --data-dir "$FP_DIETPI_USERDATA_DIRECTORY/nextcloud_data"
@@ -6599,7 +6607,7 @@ _EOF_
INSTALLING_INDEX=54
if (( ${aSOFTWARE_INSTALL_STATE[$INSTALLING_INDEX]} == 1 )); then
- /DietPi/dietpi/func/create_mysql_db phpbb3 dietpi root "$GLOBAL_PW"
+ /DietPi/dietpi/func/create_mysql_db phpbb3 "$GLOBAL_PW" root "$GLOBAL_PW"
fi
@@ -7239,7 +7247,9 @@ _EOF_
chown www-data:www-data /var/log/pihole.log
chmod 775 /var/log/pihole.log
- echo 0 &> /dev/null
+ # - Generate web interface PW: https://github.com/Fourdee/DietPi/issues/662
+ pihole -a -p "$GLOBAL_PW"
+
fi
@@ -7438,7 +7448,7 @@ _EOF_
if (( ${aSOFTWARE_INSTALL_STATE[$INSTALLING_INDEX]} == 1 )); then
#Create mysql DB
- /DietPi/dietpi/func/create_mysql_db wordpress dietpi root "$GLOBAL_PW"
+ /DietPi/dietpi/func/create_mysql_db wordpress "$GLOBAL_PW" root "$GLOBAL_PW"
fi
@@ -7697,7 +7707,7 @@ _EOF_
unzip -o sql.zip
rm sql.zip
- /DietPi/dietpi/func/create_mysql_db ampache dietpi root "$GLOBAL_PW"
+ /DietPi/dietpi/func/create_mysql_db ampache "$GLOBAL_PW" root "$GLOBAL_PW"
mysql -u root -p"$GLOBAL_PW" ampache < ampache.sql
rm ampache.sql
@@ -8045,7 +8055,7 @@ _EOF_
a2enmod rewrite
#Create Mysql DB
- /DietPi/dietpi/func/create_mysql_db pydio dietpi root "$GLOBAL_PW"
+ /DietPi/dietpi/func/create_mysql_db pydio "$GLOBAL_PW" root "$GLOBAL_PW"
#Setup Data directory
local target_data_dir="$FP_DIETPI_USERDATA_DIRECTORY/pydio_data"
@@ -8239,7 +8249,7 @@ _EOF_
cd ~/
# - Mysql DB
- /DietPi/dietpi/func/create_mysql_db baikal dietpi root "$GLOBAL_PW"
+ /DietPi/dietpi/func/create_mysql_db baikal "$GLOBAL_PW" root "$GLOBAL_PW"
fi
@@ -8384,7 +8394,7 @@ _EOF_
mkdir -p "$FP_DIETPI_USERDATA_DIRECTORY"/gogs-repo
# - sqldb
- /DietPi/dietpi/func/create_mysql_db gogs dietpi root "$GLOBAL_PW"
+ /DietPi/dietpi/func/create_mysql_db gogs "$GLOBAL_PW" root "$GLOBAL_PW"
# - service (couldnt get this to run as a new thread with systemD (&). so bash script ftw.
cat << _EOF_ > /etc/gogs/start.sh
@@ -9640,6 +9650,8 @@ _EOF_
elif (( $1 == 113 )); then
+ apt-mark unhold chromium chromedriver
+
AGP chromium
#----------------------------------------------------------------------
@@ -943,7 +943,12 @@ _EOF_
# + NanoPi NEO Air
elif (( $HW_MODEL == 64 )); then
- aWIFI_MODULES+=("dhd")
+ #4.9 uses brcm, only enable dhd for 3.x
+ if [ ! -d /boot/dtb ]; then
+
+ aWIFI_MODULES+=("dhd")
+
+ fi
fi
Oops, something went wrong.

0 comments on commit 5a001bd

Please sign in to comment.