Merge branch 'master' into next

diff --combined config/rootfiles/oldcore/177/filelists/files
index e9ba30a0cf802a81caaa667e95e4f053f8dd86aa,5f0034d81d53ddd35fc2c5355402a2b65f137a46..5f0034d81d53ddd35fc2c5355402a2b65f137a46
--- 1/config/rootfiles/oldcore/177/filelists/files
--- 2/config/rootfiles/core/177/filelists/files
+++ b/config/rootfiles/oldcore/177/filelists/files
@@@ -1,3 -1,5 +1,5 @@@
+ etc/rc.d/init.d/halt
+ etc/rc.d/init.d/reboot
  lib/firmware/amd-ucode/microcode_amd_fam17h.bin
  lib/firmware/amd-ucode/microcode_amd_fam19h.bin
  lib/firmware/amdgpu/aldebaran_mec2.bin

diff --combined config/rootfiles/oldcore/177/update.sh
index 81807994057f268221aa7de656a8a90a6af764c4,52ef205b0930bb4f8a0e99fec4a9272c8798c3ec..52ef205b0930bb4f8a0e99fec4a9272c8798c3ec
--- 1/config/rootfiles/oldcore/177/update.sh
--- 2/config/rootfiles/core/177/update.sh
+++ b/config/rootfiles/oldcore/177/update.sh
@@@ -97,6 -97,15 +97,15 @@@ rm -f 
        /opt/pakfire/db/meta/meta-squidclamav \
        /opt/pakfire/db/rootfiles/squidclamav
  
+ # remove old rngd if the addon is not installed
+ if [ ! -e "/opt/pakfire/db/installed/meta-rng-tools" ]; then
+       rm -fv /usr/bin/randstat \
+               /usr/bin/rngtest \
+               /usr/sbin/rngd \
+               /etc/rc.d/init.d/rngd \
+               /etc/rc.d/rc?.d/*rngd
+ fi
+ 
  # Extract files
  extract_files