From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 8 Apr 2019 19:47:12 +0000 (+0200)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?p=people%2Ffbuehrle%2Fipfire-2.x.git;a=commitdiff_plain;h=47204d12f1387502612e8a66b4a1a8a853e33ebf

Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

47204d12f1387502612e8a66b4a1a8a853e33ebf
diff --cc config/rootfiles/core/130/update.sh
index c039f30d8,a3a888663..71c63a3f7
--- a/config/rootfiles/core/130/update.sh
+++ b/config/rootfiles/core/130/update.sh
@@@ -130,9 -130,9 +130,12 @@@ rm -rfv 
  /etc/init.d/unbound restart
  /etc/init.d/suricata start
  
 +# Update pakfire database
 +/usr/local/bin/pakfire update --force
 +
+ # Search sensors again after reboot into the new kernel
+ rm -f  /etc/sysconfig/lm_sensors
+ 
  # Upadate Kernel version uEnv.txt
  if [ -e /boot/uEnv.txt ]; then
  	sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt