Merge remote-tracking branch 'origin/master' into next

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2026-04-28 11:43:25 +02:00 · 2023-09-17 12:20:33 +00:00
parent 13b04e6998 d1b4c380ef
commit f3d26496ac
6 changed files with 37 additions and 8 deletions
--- a/config/rootfiles/common/udev
+++ b/config/rootfiles/common/udev
@@ -70,6 +70,7 @@ lib/udev/rules.d/60-persistent-storage.rules
 lib/udev/rules.d/60-persistent-v4l.rules
 lib/udev/rules.d/60-sensor.rules
 lib/udev/rules.d/60-serial.rules
+lib/udev/rules.d/61-extrahd.rules
 lib/udev/rules.d/64-btrfs.rules
 lib/udev/rules.d/70-camera.rules
 lib/udev/rules.d/70-joystick.rules
--- a/config/rootfiles/core/180/filelists/files
+++ b/config/rootfiles/core/180/filelists/files
@@ -4,6 +4,8 @@ etc/rc.d/init.d/networking/any
 etc/rc.d/init.d/networking/functions.network
 etc/rc.d/init.d/networking/red
 etc/rc.d/init.d/networking/red.up/99-pakfire-update
+lib/udev/rules.d/61-extrahd.rules
 opt/pakfire/lib/functions.pl
+srv/web/ipfire/cgi-bin/extrahd.cgi
 srv/web/ipfire/cgi-bin/index.cgi
 var/ipfire/main/manualpages
--- a/config/rootfiles/oldcore/179/filelists/files
+++ b/config/rootfiles/oldcore/179/filelists/files
@@ -1,4 +1,5 @@
 etc/rc.d/init.d/networking/red
+lib/udev/rules.d/61-extrahd.rules
 srv/web/ipfire/cgi-bin/extrahd.cgi
 srv/web/ipfire/cgi-bin/fwhosts.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi