Permalink
Browse files

Merge branch 'testing' of https://github.com/Fourdee/DietPi into testing

  • Loading branch information...
Daniel (Fourdee)
Daniel (Fourdee) committed Sep 16, 2018
2 parents 2c1cc08 + 68e44af commit b787e84612052f6b0ef5921577521f2acaae62fa
Showing with 8 additions and 1 deletion.
  1. +1 −0 CHANGELOG.txt
  2. +4 −1 PREP_SYSTEM_FOR_DIETPI.sh
  3. +3 −0 dietpi/patch_file
@@ -8,6 +8,7 @@ DietPi-Software | Pi-hole: You can now install Pi-hole again on Debian Jessie sy
Bug Fixes:
General | Resolved an issue where 1st run setup password prompt, would run twice. Once on 1st run and once after updates are completed.
General | Resolved an external issue where in very rare cases WiFi interfaces were not initiated successfully: https://github.com/Fourdee/DietPi/issues/2074
DietPi-Config | Resolved an issue with selected WiFi SSID not being correctly applied: https://github.com/Fourdee/DietPi/issues/2070#issuecomment-421060961
-----------------------------------------------------------------------------------------------------------
@@ -1138,6 +1138,9 @@ _EOF_
fi
# Fix rare WiFi interface start issue: https://github.com/Fourdee/DietPi/issues/2074
sed -i '\|^[[:blank:]]ifconfig "$IFACE" up$|c\\t/sbin/ip link set dev "$IFACE" up' /etc/network/if-pre-up.d/wireless-tools &> /dev/null
G_DIETPI-NOTIFY 2 'Tweaking DHCP timeout:'
# - Reduce DHCP request retry count and timeouts: https://github.com/Fourdee/DietPi/issues/711
@@ -1164,7 +1167,7 @@ _EOF_
mkdir -p /root/.config/htop
cp /DietPi/dietpi/conf/htoprc /root/.config/htop/htoprc
G_DIETPI-NOTIFY 2 'Configuring fakehwclock:'
G_DIETPI-NOTIFY 2 'Configuring fake-hwclock:'
# - allow times in the past
G_CONFIG_INJECT 'FORCE=' 'FORCE=force' /etc/default/fake-hwclock
@@ -1274,6 +1274,9 @@ _EOF_
fi
#-------------------------------------------------------------------------------
#Fix rare WiFi interface start issue: https://github.com/Fourdee/DietPi/issues/2074
sed -i '\|^[[:blank:]]ifconfig "$IFACE" up$|c\\t/sbin/ip link set dev "$IFACE" up' /etc/network/if-pre-up.d/wireless-tools &> /dev/null
#-------------------------------------------------------------------------------
fi

0 comments on commit b787e84

Please sign in to comment.