From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4dHDPN0GnDz2ynX for ; Thu, 27 Nov 2025 11:15:36 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4dHDPM6y61z2xHk for ; Thu, 27 Nov 2025 11:15:35 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [IPv6:2001:678:b28::161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E8" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4dHDPM2Mv7z2KR for ; Thu, 27 Nov 2025 11:15:35 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1764242135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=To+d8SgmySVmX2NOTKYD4sgkx/Ns0q5fF3BV9a11CmM=; b=h8KR4oWyAdgQCv4+q+h7CeeqcXrEm+0+U7FRED2kOZvWpkKl1jomU0Gzim3AlC0QN9Tlsi 7s/DOySvm50vZxAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1764242135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=To+d8SgmySVmX2NOTKYD4sgkx/Ns0q5fF3BV9a11CmM=; b=KJYzMKa52V1+dG7qfG3dKKbGCjPe7TEgH/FfE+Qzdlc02W7VHz16yjf5dRvEvKfjJiQY2S D/wLN+ZPlfLd5DwKsI2+RzSVZ6s14Y57kesiERO6uFqQv6AhiVqfXXqB/bqkovB/XCxy0/ mf3dJYikxSiW/imLRaSLVAdI3jVxsSG74ocs3NW3NmduEarj0TnKxcFNbF9MbkdjEtlu+l wDsvBWcGCZbrfNGE56F+9dks4EzEEpNgb+69THyJtcH3JkzlyEQcAErpA7vbXFqUPPTKUe Dwnyom0oPS4EJTIZ9FWCiITe0oRk0+T8wI3spdXpWhdFOeppr3ce4u/fjrn+zA== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4dHDPM0tMHz2xP6; Thu, 27 Nov 2025 11:15:35 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 75ecc4831af721e93f8eef3a6879a15c486137ed X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: dbc58c88907c9e38d803ac0c6a2200a364fc3e3f X-Git-Newrev: 75ecc4831af721e93f8eef3a6879a15c486137ed Message-Id: <4dHDPM0tMHz2xP6@people01.haj.ipfire.org> Date: Thu, 27 Nov 2025 11:15:34 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: 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, master has been updated via 75ecc4831af721e93f8eef3a6879a15c486137ed (commit) via 9f55a31459d6ca64f2827bc8eadb6e981245df75 (commit) via 9457019809d8aa7dc1731a73e5edb131ce383026 (commit) via 6026963e0f4a0b04ba2b3bc372007e4a2bfefd22 (commit) via ef61e8a0596ca5f0b56c139339a5a20d4745e786 (commit) via 3db5ec53f6da36cc9f0f886b641f30316f50aa48 (commit) via a2097f8b43b23082c976ece3fadeb7da4b84cd89 (commit) via c6ffbd2fcd2d155322d2fa989e6b9ee2e6bfced4 (commit) from dbc58c88907c9e38d803ac0c6a2200a364fc3e3f (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 75ecc4831af721e93f8eef3a6879a15c486137ed Author: Michael Tremer Date: Thu Nov 27 11:14:24 2025 +0000 manualpages: Add LLDP page Fixes: #13913 - Add LLDP helper button to lldp.cgi Signed-off-by: Michael Tremer commit 9f55a31459d6ca64f2827bc8eadb6e981245df75 Author: Michael Tremer Date: Thu Nov 27 11:11:49 2025 +0000 dracut-ng: Configure to create universally bootable initramdisks We don't want to build an initramdisk only for the current host so that IPFire devices will boot on various hardware. Signed-off-by: Michael Tremer commit 9457019809d8aa7dc1731a73e5edb131ce383026 Author: Michael Tremer Date: Thu Nov 27 11:09:58 2025 +0000 dracut-ng: Remove default configuration We don't need to install any example/default configuration as we are controlling our own configruation in 01-ipfire.conf. Signed-off-by: Michael Tremer commit 6026963e0f4a0b04ba2b3bc372007e4a2bfefd22 Author: Michael Tremer Date: Thu Nov 27 11:07:58 2025 +0000 dracut-ng: Move ipfire.conf to 01-ipfire.conf Signed-off-by: Michael Tremer commit ef61e8a0596ca5f0b56c139339a5a20d4745e786 Author: Michael Tremer Date: Thu Nov 27 11:02:52 2025 +0000 Run "./make.sh lang" Signed-off-by: Michael Tremer commit 3db5ec53f6da36cc9f0f886b641f30316f50aa48 Author: Michael Tremer Date: Thu Nov 27 11:02:29 2025 +0000 langs: Fix "D-Bus Daemon" string Signed-off-by: Michael Tremer commit a2097f8b43b23082c976ece3fadeb7da4b84cd89 Author: Stefan Schantl Date: Wed Nov 26 19:12:48 2025 +0100 services.cgi: Add status details for messagebus Signed-off-by: Stefan Schantl Signed-off-by: Michael Tremer commit c6ffbd2fcd2d155322d2fa989e6b9ee2e6bfced4 Author: Stefan Schantl Date: Wed Nov 26 19:12:47 2025 +0100 services.cgi: Add status details for LLDPD Signed-off-by: Stefan Schantl Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/cfgroot/manualpages | 1 + config/dracut/ipfire.conf | 6 +++++- config/rootfiles/common/dracut-ng | 19 +------------------ config/rootfiles/core/199/filelists/files | 1 + config/rootfiles/core/199/update.sh | 3 ++- 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 +++++- 20 files changed, 48 insertions(+), 21 deletions(-) Difference in files: 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/199/filelists/files b/config/rootfiles/core/199/filelists/files index 0d20bb165..1e574a6e4 100644 --- a/config/rootfiles/core/199/filelists/files +++ b/config/rootfiles/core/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/core/199/update.sh b/config/rootfiles/core/199/update.sh index 90e6060e6..933cdd6bc 100644 --- a/config/rootfiles/core/199/update.sh +++ b/config/rootfiles/core/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 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) hooks/post-receive -- IPFire 2.x development tree