* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3ee6b853cca9c08ed1d0f9428ca193fefc3d7721
@ 2025-11-27 11:18 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2025-11-27 11:18 UTC (permalink / raw)
To: ipfire-scm
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 3ee6b853cca9c08ed1d0f9428ca193fefc3d7721 (commit)
via d296ad8d986e6d82cfd08dcc72a67f96ad4c826e (commit)
via 352cd1b0a2cf266c4bbc6bb7fac7646299f650bb (commit)
via 1cc63f13e01067efd559698e9ab3c35640b38a95 (commit)
via 75ecc4831af721e93f8eef3a6879a15c486137ed (commit)
via 9f55a31459d6ca64f2827bc8eadb6e981245df75 (commit)
via 9457019809d8aa7dc1731a73e5edb131ce383026 (commit)
via 6026963e0f4a0b04ba2b3bc372007e4a2bfefd22 (commit)
via ef61e8a0596ca5f0b56c139339a5a20d4745e786 (commit)
via 3db5ec53f6da36cc9f0f886b641f30316f50aa48 (commit)
via a2097f8b43b23082c976ece3fadeb7da4b84cd89 (commit)
via c6ffbd2fcd2d155322d2fa989e6b9ee2e6bfced4 (commit)
via dbc58c88907c9e38d803ac0c6a2200a364fc3e3f (commit)
via 77d9e3e4c2f3c0f573ac40318950e106755a236d (commit)
via fce1c71108c9e3ed2f574fb30ce58d8bcbd342a6 (commit)
via 9745aa67b3ebdf2b6d4b574a25066fb25d0d0009 (commit)
via 05877ded9d658eb051b4482833bc333e57e5ab29 (commit)
via 018db0afbc778057f2fe03dfdbb2f03c05e5c1bd (commit)
via e99655e9c77c67b19fdf10575755b8d4f392570e (commit)
via d451f131ff19cc090d78712adc9309dd5bed2990 (commit)
via f1e4331fa76b628c91057aca8e501c87de90283b (commit)
from aa100ddc43d7c9d722a2f7d8a8421e844eec4e6f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3ee6b853cca9c08ed1d0f9428ca193fefc3d7721
Merge: d296ad8d9 75ecc4831
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu Nov 27 11:17:14 2025 +0000
Merge branch 'master' into next
commit d296ad8d986e6d82cfd08dcc72a67f96ad4c826e
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu Nov 27 11:16:43 2025 +0000
core200: Ship Unbound
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 352cd1b0a2cf266c4bbc6bb7fac7646299f650bb
Author: Matthias Fischer <matthias.fischer@ipfire.org>
Date: Wed Nov 26 21:36:38 2025 +0100
unbound: Update to 1.24.2
For details see:
https://nlnetlabs.nl/projects/unbound/download/#unbound-1-24-2
"Bug Fixes
Additional fix for CVE-2025-11411 (possible domain hijacking attack),
to include YXDOMAIN and non-referral nodata answers in the mitigation
as well, reported by TaoFei Guo from Peking University, Yang Luo and
JianJun Chen from Tsinghua University."
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 1cc63f13e01067efd559698e9ab3c35640b38a95
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue Nov 25 15:54:56 2025 +0000
installer: Don't try to load the NTFS module
For some reason, this could not be packaged and therefore was not
loaded. Since nobody has reported any problems, we can simply drop this
here.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/general-functions.pl | 4 +-
config/cfgroot/manualpages | 1 +
config/dracut/ipfire.conf | 6 ++-
config/rootfiles/common/dracut-ng | 19 +-------
.../{oldcore/106 => core/200}/filelists/unbound | 0
config/rootfiles/core/200/update.sh | 1 +
config/rootfiles/oldcore/198/filelists/files | 2 +
config/rootfiles/oldcore/198/update.sh | 5 +++
config/rootfiles/oldcore/199/filelists/files | 1 +
config/rootfiles/oldcore/199/update.sh | 5 ++-
doc/language_issues.de | 1 +
doc/language_issues.en | 1 +
doc/language_issues.es | 1 +
doc/language_issues.fr | 1 +
doc/language_issues.it | 1 +
doc/language_issues.nl | 1 +
doc/language_issues.pl | 1 +
doc/language_issues.ru | 1 +
doc/language_issues.tr | 1 +
doc/language_issues.tw | 1 +
doc/language_issues.zh | 1 +
doc/language_missings | 10 +++++
html/cgi-bin/services.cgi | 11 +++++
langs/en/cgi-bin/en.pl | 1 +
lfs/dracut-ng | 6 ++-
lfs/unbound | 4 +-
src/initscripts/packages/hostapd | 51 +++++++++++++---------
src/installer/dracut-module/module-setup.sh | 2 +-
src/installer/main.c | 1 -
29 files changed, 93 insertions(+), 48 deletions(-)
copy config/rootfiles/{oldcore/106 => core/200}/filelists/unbound (100%)
Difference in files:
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 94d0e7440..1c3374d86 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -66,13 +66,13 @@ sub system_output($) {
die "Could not execute @command: $!";
}
- waitpid($pid, 0);
-
while (<OUTPUT>) {
push(@output, $_);
}
close(OUTPUT);
+ waitpid($pid, 0);
+
return @output;
}
diff --git a/config/cfgroot/manualpages b/config/cfgroot/manualpages
index 41d6b599e..2a9a0e4e9 100644
--- a/config/cfgroot/manualpages
+++ b/config/cfgroot/manualpages
@@ -38,6 +38,7 @@ proxy.cgi=configuration/network/proxy
urlfilter.cgi=configuration/network/proxy/url-filter
updatexlrator.cgi=configuration/network/proxy/update_accelerator
dhcp.cgi=configuration/network/dhcp
+lldp.cgi=configuration/network/lldp
captive.cgi=configuration/network/captive
connscheduler.cgi=configuration/network/connectionscheduler
hosts.cgi=configuration/network/hosts
diff --git a/config/dracut/ipfire.conf b/config/dracut/ipfire.conf
index a5e0ea62e..f81d4be16 100644
--- a/config/dracut/ipfire.conf
+++ b/config/dracut/ipfire.conf
@@ -1,3 +1,7 @@
+# Build a universally bootable initramdisk
+hostonly="no"
+hostonly_cmdline="no"
+
# Load microcode for the CPU early
early_microcode="yes"
@@ -5,4 +9,4 @@ early_microcode="yes"
compress="zstd -10 -q -T1"
# Disable default stripping of binaries
-do_strip="no"
\ No newline at end of file
+do_strip="no"
diff --git a/config/rootfiles/common/dracut-ng b/config/rootfiles/common/dracut-ng
index e8a85c9d4..3b492651c 100644
--- a/config/rootfiles/common/dracut-ng
+++ b/config/rootfiles/common/dracut-ng
@@ -13,24 +13,7 @@ usr/lib/dracut/dracut-logger.sh
usr/lib/dracut/dracut-util
usr/lib/dracut/dracut-version.sh
usr/lib/dracut/dracut.conf.d
-#usr/lib/dracut/dracut.conf.d/10-hostonly.conf
-#usr/lib/dracut/dracut.conf.d/fips
-#usr/lib/dracut/dracut.conf.d/fips/10-fips.conf
-#usr/lib/dracut/dracut.conf.d/generic
-#usr/lib/dracut/dracut.conf.d/generic/11-generic.conf
-#usr/lib/dracut/dracut.conf.d/hostonly
-#usr/lib/dracut/dracut.conf.d/hostonly/10-hostonly.conf
-#usr/lib/dracut/dracut.conf.d/ima
-#usr/lib/dracut/dracut.conf.d/ima/10-ima.conf
-usr/lib/dracut/dracut.conf.d/ipfire.conf
-#usr/lib/dracut/dracut.conf.d/no-network
-#usr/lib/dracut/dracut.conf.d/no-network/10-no-network.conf
-#usr/lib/dracut/dracut.conf.d/no-xattr
-#usr/lib/dracut/dracut.conf.d/no-xattr/10-no-xattr.conf
-#usr/lib/dracut/dracut.conf.d/rescue
-#usr/lib/dracut/dracut.conf.d/rescue/10-rescue.conf
-#usr/lib/dracut/dracut.conf.d/uki-virt
-#usr/lib/dracut/dracut.conf.d/uki-virt/10-uki-virt.conf
+usr/lib/dracut/dracut.conf.d/01-ipfire.conf
#usr/lib/dracut/modules.d
usr/lib/dracut/modules.d/10bash
usr/lib/dracut/modules.d/10bash/module-setup.sh
diff --git a/config/rootfiles/core/200/filelists/unbound b/config/rootfiles/core/200/filelists/unbound
new file mode 120000
index 000000000..66adf0924
--- /dev/null
+++ b/config/rootfiles/core/200/filelists/unbound
@@ -0,0 +1 @@
+../../../common/unbound
\ No newline at end of file
diff --git a/config/rootfiles/core/200/update.sh b/config/rootfiles/core/200/update.sh
index a98f2799c..97c3f6f90 100644
--- a/config/rootfiles/core/200/update.sh
+++ b/config/rootfiles/core/200/update.sh
@@ -70,6 +70,7 @@ ldconfig
/usr/local/bin/sshctrl
# Start services
+/etc/init.d/unbound restart
# This update needs a reboot...
#touch /var/run/need_reboot
diff --git a/config/rootfiles/oldcore/198/filelists/files b/config/rootfiles/oldcore/198/filelists/files
index 709788ae8..5cd3cdb78 100644
--- a/config/rootfiles/oldcore/198/filelists/files
+++ b/config/rootfiles/oldcore/198/filelists/files
@@ -1,6 +1,8 @@
+etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
etc/rc.d/init.d/cleanfs
etc/rc.d/init.d/suricata
srv/web/ipfire/cgi-bin/dns.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
var/ipfire/graphs.pl
var/ipfire/header.pl
var/ipfire/ids-functions.pl
diff --git a/config/rootfiles/oldcore/198/update.sh b/config/rootfiles/oldcore/198/update.sh
index bb08f493e..d64f965ac 100644
--- a/config/rootfiles/oldcore/198/update.sh
+++ b/config/rootfiles/oldcore/198/update.sh
@@ -53,6 +53,10 @@ usermod -a -G mail suricata
chmod 640 /var/ipfire/dma/auth.conf
chown nobody:mail /var/ipfire/dma/auth.conf
+# Upgrade the proxy configuration
+sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi
+/etc/init.d/squid reload
+
# update linker config
ldconfig
@@ -71,6 +75,7 @@ telinit u
# Start services
/etc/init.d/suricata restart
/etc/init.d/fcron restart
+/etc/init.d/apache reload
# Build initial ramdisks (for intel-microcode)
dracut --regenerate-all --force
diff --git a/config/rootfiles/oldcore/199/filelists/files b/config/rootfiles/oldcore/199/filelists/files
index 0d20bb165..1e574a6e4 100644
--- a/config/rootfiles/oldcore/199/filelists/files
+++ b/config/rootfiles/oldcore/199/filelists/files
@@ -30,6 +30,7 @@ var/ipfire/backup/include
var/ipfire/general-functions.pl
var/ipfire/header.pl
var/ipfire/lldp
+var/ipfire/main/manualpages
var/ipfire/menu.d/30-network.menu
var/ipfire/qos/bin/makeqosscripts.pl
var/spool/cron/root.orig
diff --git a/config/rootfiles/oldcore/199/update.sh b/config/rootfiles/oldcore/199/update.sh
index 561b7a8ef..933cdd6bc 100644
--- a/config/rootfiles/oldcore/199/update.sh
+++ b/config/rootfiles/oldcore/199/update.sh
@@ -101,7 +101,8 @@ done
# Remove files
rm -rfv \
- /lib/udev
+ /lib/udev \
+ /usr/lib/dracut/dracut.conf.d
# Create the messagebus group
if ! getent group messagebus >/dev/null; then
@@ -141,6 +142,8 @@ sudo -u nobody /srv/web/ipfire/cgi-bin/ovpnmain.cgi
/etc/init.d/unbound restart
/etc/init.d/sshd restart
/etc/init.d/ipsec restart
+/usr/local/bin/qosctrl generate
+/usr/local/bin/qosctrl start
# Re-import the updated crontab
fcrontab -z
diff --git a/doc/language_issues.de b/doc/language_issues.de
index fcadb5ace..9d8ed9011 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -1035,6 +1035,7 @@ WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulatio
WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks
WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks
WARNING: untranslated string: mdstat = Mdstat
+WARNING: untranslated string: messagebus = D-Bus Daemon
WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon
WARNING: untranslated string: no entries = No entries at the moment.
WARNING: untranslated string: oops something went wrong = Oops, something went wrong...
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 3292205f7..3e764c9dd 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1320,6 +1320,7 @@ WARNING: untranslated string: medium = Medium
WARNING: untranslated string: meltdown = Meltdown
WARNING: untranslated string: memory = Memory
WARNING: untranslated string: memory information = Memory information
+WARNING: untranslated string: messagebus = D-Bus Daemon
WARNING: untranslated string: messages = Messages
WARNING: untranslated string: method = Method:
WARNING: untranslated string: min costs = Minimum costs
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 75557dfb2..48dfffa7e 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1080,6 +1080,7 @@ WARNING: untranslated string: lldp invalid description = Invalid description. Al
WARNING: untranslated string: lldp neighbors = Neighbors
WARNING: untranslated string: lldp there are no neighbors = There are currently no neighbors
WARNING: untranslated string: mdstat = Mdstat
+WARNING: untranslated string: messagebus = D-Bus Daemon
WARNING: untranslated string: no data = unknown string
WARNING: untranslated string: offloaded = Offloaded
WARNING: untranslated string: online = Online
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index ad703d24a..65b3838d0 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -1082,6 +1082,7 @@ WARNING: untranslated string: malformed preshared key = Malformed Pre-Shared Key
WARNING: untranslated string: malformed private key = Malformed Private Key
WARNING: untranslated string: malformed public key = Malformed Public Key
WARNING: untranslated string: mdstat = Mdstat
+WARNING: untranslated string: messagebus = D-Bus Daemon
WARNING: untranslated string: offloaded = Offloaded
WARNING: untranslated string: online = Online
WARNING: untranslated string: oops something went wrong = Oops, something went wrong...
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 18ebfa257..83cbc8afa 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1293,6 +1293,7 @@ WARNING: untranslated string: masquerading disabled = Masquerading disabled
WARNING: untranslated string: masquerading enabled = Masquerading enabled
WARNING: untranslated string: mdstat = Mdstat
WARNING: untranslated string: meltdown = Meltdown
+WARNING: untranslated string: messagebus = D-Bus Daemon
WARNING: untranslated string: messages = Messages
WARNING: untranslated string: mitigated = Mitigated
WARNING: untranslated string: mmio stale data = MMIO Stale Data
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 169abfccb..0748c0a56 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1300,6 +1300,7 @@ WARNING: untranslated string: masquerading disabled = Masquerading disabled
WARNING: untranslated string: masquerading enabled = Masquerading enabled
WARNING: untranslated string: mdstat = Mdstat
WARNING: untranslated string: meltdown = Meltdown
+WARNING: untranslated string: messagebus = D-Bus Daemon
WARNING: untranslated string: messages = Messages
WARNING: untranslated string: mitigated = Mitigated
WARNING: untranslated string: mmio stale data = MMIO Stale Data
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 944774110..e3b92b923 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1430,6 +1430,7 @@ WARNING: untranslated string: masquerading enabled = Masquerading enabled
WARNING: untranslated string: maximum = Maximum
WARNING: untranslated string: mdstat = Mdstat
WARNING: untranslated string: meltdown = Meltdown
+WARNING: untranslated string: messagebus = D-Bus Daemon
WARNING: untranslated string: messages = Messages
WARNING: untranslated string: minimum = Minimum
WARNING: untranslated string: minute = Minute
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index d2a4f57a5..1ffc922a2 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1429,6 +1429,7 @@ WARNING: untranslated string: masquerading enabled = Masquerading enabled
WARNING: untranslated string: maximum = Maximum
WARNING: untranslated string: mdstat = Mdstat
WARNING: untranslated string: meltdown = Meltdown
+WARNING: untranslated string: messagebus = D-Bus Daemon
WARNING: untranslated string: messages = Messages
WARNING: untranslated string: minimum = Minimum
WARNING: untranslated string: minute = Minute
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index fe2e0e527..475dfaa24 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1217,6 +1217,7 @@ WARNING: untranslated string: malformed private key = Malformed Private Key
WARNING: untranslated string: malformed public key = Malformed Public Key
WARNING: untranslated string: mdstat = Mdstat
WARNING: untranslated string: meltdown = Meltdown
+WARNING: untranslated string: messagebus = D-Bus Daemon
WARNING: untranslated string: mitigated = Mitigated
WARNING: untranslated string: mmio stale data = MMIO Stale Data
WARNING: untranslated string: mtu = MTU
diff --git a/doc/language_issues.tw b/doc/language_issues.tw
index 4da8e6224..73e116b7c 100644
--- a/doc/language_issues.tw
+++ b/doc/language_issues.tw
@@ -1088,6 +1088,7 @@ WARNING: untranslated string: lldp invalid description = Invalid description. Al
WARNING: untranslated string: lldp neighbors = Neighbors
WARNING: untranslated string: lldp there are no neighbors = There are currently no neighbors
WARNING: untranslated string: max bandwidth = Maximum bandwidth
+WARNING: untranslated string: messagebus = D-Bus Daemon
WARNING: untranslated string: no data = unknown string
WARNING: untranslated string: offloaded = Offloaded
WARNING: untranslated string: online = Online
diff --git a/doc/language_issues.zh b/doc/language_issues.zh
index 4da8e6224..73e116b7c 100644
--- a/doc/language_issues.zh
+++ b/doc/language_issues.zh
@@ -1088,6 +1088,7 @@ WARNING: untranslated string: lldp invalid description = Invalid description. Al
WARNING: untranslated string: lldp neighbors = Neighbors
WARNING: untranslated string: lldp there are no neighbors = There are currently no neighbors
WARNING: untranslated string: max bandwidth = Maximum bandwidth
+WARNING: untranslated string: messagebus = D-Bus Daemon
WARNING: untranslated string: no data = unknown string
WARNING: untranslated string: offloaded = Offloaded
WARNING: untranslated string: online = Online
diff --git a/doc/language_missings b/doc/language_missings
index fa60126e7..ab82a573d 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -84,6 +84,7 @@
< log drop hostile in
< log drop hostile out
< mdstat
+< messagebus
< netbios nameserver daemon
< no entries
< notes
@@ -184,6 +185,7 @@
< lldp neighbors
< lldp there are no neighbors
< mdstat
+< messagebus
< offloaded
< online
< ovpn ciphers
@@ -303,6 +305,7 @@
< malformed private key
< malformed public key
< mdstat
+< messagebus
< offloaded
< online
< oops something went wrong
@@ -811,6 +814,7 @@
< masquerading enabled
< mdstat
< meltdown
+< messagebus
< messages
< mitigated
< mmio stale data
@@ -1509,6 +1513,7 @@
< masquerading enabled
< mdstat
< meltdown
+< messagebus
< messages
< mitigated
< mmio stale data
@@ -2521,6 +2526,7 @@
< MB written
< mdstat
< meltdown
+< messagebus
< messages
< minimum
< minute
@@ -3688,6 +3694,7 @@
< MB written
< mdstat
< meltdown
+< messagebus
< messages
< minimum
< minute
@@ -4409,6 +4416,7 @@
< malformed public key
< mdstat
< meltdown
+< messagebus
< mitigated
< mmio stale data
< mtu
@@ -4686,6 +4694,7 @@
< lldp neighbors
< lldp there are no neighbors
< max bandwidth
+< messagebus
< offloaded
< online
< ovpn ciphers
@@ -4786,6 +4795,7 @@
< lldp neighbors
< lldp there are no neighbors
< max bandwidth
+< messagebus
< offloaded
< online
< ovpn ciphers
diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 8b92f7e08..4530d27f4 100644
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -115,6 +115,17 @@ $querry[1] = 'hour' unless defined $querry[1];
$Lang::tr{'ovpn roadwarrior server'} => {
"process" => "openvpn",
"pidfile" => "/var/run/openvpn-rw.pid",
+ },
+
+ # LLDPD
+ $Lang::tr{'lldp'} => {
+ "process" => "lldpd",
+ },
+
+ # DBus
+ $Lang::tr{'messagebus'} => {
+ "process" => "dbus-daemon",
+ "pidfile" => "/var/run/dbus/pid",
}
});
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index e5f10db74..254d1cb33 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1839,6 +1839,7 @@
'memory' => 'Memory',
'memory information' => 'Memory information',
'memory usage per' => 'Memory Usage per',
+'messagebus' => 'D-Bus Daemon',
'messages' => 'Messages',
'messages logging' => 'Logsettings for /var/log/messages',
'method' => 'Method:',
diff --git a/lfs/dracut-ng b/lfs/dracut-ng
index ecb2828e2..68c26adb7 100644
--- a/lfs/dracut-ng
+++ b/lfs/dracut-ng
@@ -81,8 +81,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
sbindir=/sbin \
sysconfdir=/etc
+ # Remove any default configuration
+ rm -rvf /usr/lib/dracut/dracut.conf.d/*
+
+ # Install the IPFire configuration
cp -vf $(DIR_SRC)/config/dracut/ipfire.conf \
- /usr/lib/dracut/dracut.conf.d/ipfire.conf
+ /usr/lib/dracut/dracut.conf.d/01-ipfire.conf
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/unbound b/lfs/unbound
index 5ac1946fb..5df07f965 100644
--- a/lfs/unbound
+++ b/lfs/unbound
@@ -24,7 +24,7 @@
include Config
-VER = 1.24.1
+VER = 1.24.2
THISAPP = unbound-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = e80c9e80139140a1de50bf4d8c6ee42917ce615e6b9d4297d1f29d940d1701c6da59200163025fa7870e41402021a878459c0a5c0d947f5ce718a16939311daa
+$(DL_FILE)_BLAKE2 = 05a772193a023d6387067b0d6d67a43d1bbfba2ef805a9602a5d3a9bc93d0564d750a7741e9a60d3a7391822131f382c37a9819f51c141fe876a68fce6f8a1c6
install : $(TARGET)
diff --git a/src/initscripts/packages/hostapd b/src/initscripts/packages/hostapd
index 44d697aeb..5384badab 100644
--- a/src/initscripts/packages/hostapd
+++ b/src/initscripts/packages/hostapd
@@ -118,10 +118,6 @@ write_config() {
# Fetch the PHY
local phy="$(</sys/class/net/${interface}/phy80211/name)"
- # Fetch the driver
- local driver="$(readlink /sys/class/net/${interface}/device/driver)"
- driver="${driver##*/}"
-
local flag
local ht_flags=0
local vht_flags=0
@@ -130,10 +126,18 @@ write_config() {
local eht_mac_flags=0
local eht_phy_flags=0
- local ht_caps=()
- local vht_caps=()
- local he_caps=()
- local eht_caps=()
+ # Set some default BAND if none is set
+ if [ -z "${BAND}" ]; then
+ # Use 2.4 GHz for 802.11g/n and assume 5 GHz for anything else
+ case "${HW_MODE}" in
+ gn)
+ BAND="2g"
+ ;;
+ *)
+ BAND="5g"
+ ;;
+ esac
+ fi
# Fetch PHY information
local line
@@ -157,9 +161,27 @@ write_config() {
"Capabilities: "*)
ht_flags="${line:14}"
;;
+
+ # Check if we are in the right band
+ "* 2412.0 MHz"*)
+ if [ "${BAND}" = "2g" ]; then
+ break
+ fi
+ ;;
+
+ "* 5180.0 MHz"*)
+ if [ "${BAND}" = "5g" ]; then
+ break
+ fi
+ ;;
esac
done <<<"$(iw phy "${phy}" info)"
+ local ht_caps=()
+ local vht_caps=()
+ local he_caps=()
+ local eht_caps=()
+
# HT Capabilities
for flag in ${!HT_CAPS[@]}; do
if (( ${ht_flags} & ${flag} )); then
@@ -304,19 +326,6 @@ write_config() {
esac
fi
- # Set some default BAND if none is set
- if [ -z "${BAND}" ]; then
- # Use 2.4 GHz for 802.11g/n and assume 5 GHz for anything else
- case "${HW_MODE}" in
- gn)
- BAND="2g"
- ;;
- *)
- BAND="5g"
- ;;
- esac
- fi
-
# Header
echo "# Automatically generated configuration"
echo "# DO NOT EDIT"
diff --git a/src/installer/dracut-module/module-setup.sh b/src/installer/dracut-module/module-setup.sh
index 8a8de87d7..c463e499c 100755
--- a/src/installer/dracut-module/module-setup.sh
+++ b/src/installer/dracut-module/module-setup.sh
@@ -31,7 +31,7 @@ install() {
# Filesystem support
inst_multiple parted mkswap mke2fs mkfs.xfs mkfs.vfat mkfs.btrfs
- instmods ext4 iso9660 vfat xfs ntfs3 btrfs
+ instmods ext4 iso9660 vfat xfs btrfs
# Extraction
inst_multiple tar gzip zstd
diff --git a/src/installer/main.c b/src/installer/main.c
index f5f5672bf..f8800a657 100644
--- a/src/installer/main.c
+++ b/src/installer/main.c
@@ -386,7 +386,6 @@ int main(int argc, char *argv[]) {
// Load common modules
mysystem(logfile, "/sbin/modprobe vfat"); // USB key
- mysystem(logfile, "/sbin/modprobe ntfs3"); // USB key
hw_stop_all_raid_arrays(logfile);
if (!config.unattended) {
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-11-27 11:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-11-27 11:18 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3ee6b853cca9c08ed1d0f9428ca193fefc3d7721 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox