Merge branch 'next' into temp-c170-development

2026-04-27 19:23:24 +02:00 · 2022-07-06 06:14:54 +00:00
parent 5503a18d71 8000bc0a43
commit f42dc99758
33 changed files with 262 additions and 326 deletions
--- a/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@ -71,7 +71,6 @@ etc/rc.d/init.d/networking/wpa_supplicant.exe
 etc/rc.d/init.d/ntp
 etc/rc.d/init.d/pakfire
 etc/rc.d/init.d/partresize
-etc/rc.d/init.d/random
 etc/rc.d/init.d/rc
 etc/rc.d/init.d/reboot
 etc/rc.d/init.d/rngd
@@ -187,7 +186,6 @@ etc/rc.d/rcsysinit.d/S45udev_retry
 etc/rc.d/rcsysinit.d/S50cleanfs
 etc/rc.d/rcsysinit.d/S60setclock
 etc/rc.d/rcsysinit.d/S65rngd
-etc/rc.d/rcsysinit.d/S66random
 etc/rc.d/rcsysinit.d/S70console
 etc/rc.d/rcsysinit.d/S71pakfire
 etc/rc.d/rcsysinit.d/S73swconfig
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -7212,6 +7212,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/DEVPORT
 #lib/modules/KVER-ipfire/build/include/config/DEVTMPFS
 #lib/modules/KVER-ipfire/build/include/config/DEVTMPFS_MOUNT
+#lib/modules/KVER-ipfire/build/include/config/DEVTMPFS_SAFE
 #lib/modules/KVER-ipfire/build/include/config/DEV_COREDUMP
 #lib/modules/KVER-ipfire/build/include/config/DIMLIB
 #lib/modules/KVER-ipfire/build/include/config/DL2K
--- a/config/rootfiles/common/armv6l/initscripts
+++ b/config/rootfiles/common/armv6l/initscripts
@@ -71,7 +71,6 @@ etc/rc.d/init.d/networking/wpa_supplicant.exe
 etc/rc.d/init.d/ntp
 etc/rc.d/init.d/pakfire
 etc/rc.d/init.d/partresize
-etc/rc.d/init.d/random
 etc/rc.d/init.d/rc
 etc/rc.d/init.d/reboot
 etc/rc.d/init.d/rngd
@@ -187,7 +186,6 @@ etc/rc.d/rcsysinit.d/S45udev_retry
 etc/rc.d/rcsysinit.d/S50cleanfs
 etc/rc.d/rcsysinit.d/S60setclock
 etc/rc.d/rcsysinit.d/S65rngd
-etc/rc.d/rcsysinit.d/S66random
 etc/rc.d/rcsysinit.d/S70console
 etc/rc.d/rcsysinit.d/S71pakfire
 etc/rc.d/rcsysinit.d/S73swconfig
--- a/config/rootfiles/common/armv6l/linux
+++ b/config/rootfiles/common/armv6l/linux
@@ -7664,6 +7664,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/DEVPORT
 #lib/modules/KVER-ipfire/build/include/config/DEVTMPFS
 #lib/modules/KVER-ipfire/build/include/config/DEVTMPFS_MOUNT
+#lib/modules/KVER-ipfire/build/include/config/DEVTMPFS_SAFE
 #lib/modules/KVER-ipfire/build/include/config/DEV_COREDUMP
 #lib/modules/KVER-ipfire/build/include/config/DIMLIB
 #lib/modules/KVER-ipfire/build/include/config/DL2K
--- a/config/rootfiles/common/web-user-interface
+++ b/config/rootfiles/common/web-user-interface
@@ -15,7 +15,6 @@ srv/web/ipfire/cgi-bin/ddns.cgi
 srv/web/ipfire/cgi-bin/dhcp.cgi
 srv/web/ipfire/cgi-bin/dns.cgi
 srv/web/ipfire/cgi-bin/dnsforward.cgi
-srv/web/ipfire/cgi-bin/entropy.cgi
 srv/web/ipfire/cgi-bin/extrahd.cgi
 srv/web/ipfire/cgi-bin/fireinfo.cgi
 srv/web/ipfire/cgi-bin/firewall.cgi
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -71,7 +71,6 @@ etc/rc.d/init.d/networking/wpa_supplicant.exe
 etc/rc.d/init.d/ntp
 etc/rc.d/init.d/pakfire
 etc/rc.d/init.d/partresize
-etc/rc.d/init.d/random
 etc/rc.d/init.d/rc
 etc/rc.d/init.d/reboot
 etc/rc.d/init.d/rngd
@@ -186,7 +185,6 @@ etc/rc.d/rcsysinit.d/S45udev_retry
 etc/rc.d/rcsysinit.d/S50cleanfs
 etc/rc.d/rcsysinit.d/S60setclock
 etc/rc.d/rcsysinit.d/S65rngd
-etc/rc.d/rcsysinit.d/S66random
 etc/rc.d/rcsysinit.d/S70console
 etc/rc.d/rcsysinit.d/S71pakfire
 etc/rc.d/rcsysinit.d/S74cloud-init
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -7124,6 +7124,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/DEVPORT
 #lib/modules/KVER-ipfire/build/include/config/DEVTMPFS
 #lib/modules/KVER-ipfire/build/include/config/DEVTMPFS_MOUNT
+#lib/modules/KVER-ipfire/build/include/config/DEVTMPFS_SAFE
 #lib/modules/KVER-ipfire/build/include/config/DEV_COREDUMP
 #lib/modules/KVER-ipfire/build/include/config/DIMLIB
 #lib/modules/KVER-ipfire/build/include/config/DL2K