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 4gV4cx41XDz2xSM for ; Tue, 02 Jun 2026 09:03:45 +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 raw public key) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4gV4cx3gFWz2xJ0 for ; Tue, 02 Jun 2026 09:03:45 +0000 (UTC) Received: from people01.haj.ipfire.org (unknown [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 bit raw public key) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E8" (not verified)) by mail01.ipfire.org (Postfix) with ESMTPS id 4gV4cv4F2bznL for ; Tue, 02 Jun 2026 09:03:43 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1780391023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=Qt1S2c2OshlrNg+8UO0Nqf4l2qoPKBY8jbe58trRB3g=; b=kwxmLksHhtCziqt2nYdf+WuT28nAstFg/NI5MMEizmHlbyIwEf5fnHpRF3H0GcMc92r3fE QSo8Uox/0zIJheCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1780391023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=Qt1S2c2OshlrNg+8UO0Nqf4l2qoPKBY8jbe58trRB3g=; b=p12kksxwMZbFUPuvRtuTUdSeXKECmozmjHoshT5S6tHktMN3/yCa1F6zgZ3SAwHzn5eAyA ZrzsPAbmWUUKMOplwWT4rpvogpq3XjGn6rCfthQHtr2YA4Fds4XGZ8T08/1JQvB76Lf4er lR4ZSMjCxud88EE7tsh6VsUNIuDASWSLoLvi22UdA3X4PhZQvs2XQ3gjBlyQHdB1e5R6/o Z2uenT/NkBKLcsUkR7lIWyMnt91ol8fTM0esb1arMNmgbY0tuczdHF8Pb5s0mmP9fnK3kb XxJLlwenNE95W71LmuSTJObRDMpfyRj2hxYAp76QbBAxOyPYAaN7pYra7bS0NQ== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4gV4cs6CZxz2xKM; Tue, 02 Jun 2026 09:03:41 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. f8206f3c9d3a078da52fbe0fd73387ea64736286 X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: b994319910d3c908be8a0a4e2ef48bf39c7f97eb X-Git-Newrev: f8206f3c9d3a078da52fbe0fd73387ea64736286 Message-Id: <4gV4cs6CZxz2xKM@people01.haj.ipfire.org> Date: Tue, 02 Jun 2026 09:03:41 +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, next has been updated via f8206f3c9d3a078da52fbe0fd73387ea64736286 (commit) via 2e1d6ebc66da5a8d03e2c10b8bbd9d328d210782 (commit) via e36c00029394742fc9e770c40827d7957bf33ae0 (commit) from b994319910d3c908be8a0a4e2ef48bf39c7f97eb (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 f8206f3c9d3a078da52fbe0fd73387ea64736286 Author: Michael Tremer Date: Tue Jun 2 10:03:03 2026 +0100 core203: Ship /etc/init.d/localnet Signed-off-by: Michael Tremer commit 2e1d6ebc66da5a8d03e2c10b8bbd9d328d210782 Author: Michael Tremer Date: Tue Jun 2 09:59:14 2026 +0100 nss-myhostname: Drop package This does not have any effect because we configured it after dns. Therefore we can drop the entire package as we don't use any of its functionality. Signed-off-by: Michael Tremer commit e36c00029394742fc9e770c40827d7957bf33ae0 Author: Michael Tremer Date: Tue Jun 2 09:56:25 2026 +0100 initscripts: localnet: Add the system's FQDN to /etc/hosts Fixes: #13994 - Cannot access WUI via FQDN, only IP Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/etc/nsswitch.conf | 2 +- config/rootfiles/common/nss-myhostname | 4 -- config/rootfiles/core/203/filelists/files | 2 + config/rootfiles/core/203/update.sh | 4 ++ lfs/nss-myhostname | 78 ------------------------------- make.sh | 1 - src/initscripts/system/localnet | 9 ++++ 7 files changed, 16 insertions(+), 84 deletions(-) delete mode 100644 config/rootfiles/common/nss-myhostname delete mode 100644 lfs/nss-myhostname Difference in files: diff --git a/config/etc/nsswitch.conf b/config/etc/nsswitch.conf index 468fd1c88..067e63b48 100644 --- a/config/etc/nsswitch.conf +++ b/config/etc/nsswitch.conf @@ -4,7 +4,7 @@ passwd: files group: files shadow: files -hosts: files dns myhostname +hosts: files dns networks: files protocols: files diff --git a/config/rootfiles/common/nss-myhostname b/config/rootfiles/common/nss-myhostname deleted file mode 100644 index 13f38ae42..000000000 --- a/config/rootfiles/common/nss-myhostname +++ /dev/null @@ -1,4 +0,0 @@ -lib/libnss_myhostname.so.2 -#usr/share/doc/nss-myhostname -#usr/share/doc/nss-myhostname/README.html -#usr/share/doc/nss-myhostname/style.css diff --git a/config/rootfiles/core/203/filelists/files b/config/rootfiles/core/203/filelists/files index 316e67e26..c70a6c156 100644 --- a/config/rootfiles/core/203/filelists/files +++ b/config/rootfiles/core/203/filelists/files @@ -1,9 +1,11 @@ +etc/nsswitch.conf etc/rc.d/helper/aws-setup etc/rc.d/init.d/cleanfs etc/rc.d/init.d/dhcp etc/rc.d/init.d/firewall etc/rc.d/init.d/functions etc/rc.d/init.d/knot-resolver +etc/rc.d/init.d/localnet etc/rc.d/init.d/networking/red.up/25-update-dns-forwarders etc/rc.d/init.d/networking/red.up/26-time etc/rc.d/init.d/ntp diff --git a/config/rootfiles/core/203/update.sh b/config/rootfiles/core/203/update.sh index e8d9b2a37..0b1bcfa66 100644 --- a/config/rootfiles/core/203/update.sh +++ b/config/rootfiles/core/203/update.sh @@ -94,6 +94,10 @@ rm -rfv \ rm -vf \ /usr/lib/libboost*.so.1.89.0 +# Remove nss-myhostname +rm -vf \ + /lib/libnss_myhostname.so.2 + # update linker config ldconfig diff --git a/lfs/nss-myhostname b/lfs/nss-myhostname deleted file mode 100644 index 91c802b4d..000000000 --- a/lfs/nss-myhostname +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.3 - -THISAPP = nss-myhostname-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 99b9cc42c8dc5a73afe9dddfad6c05d175246ffb7985fb90b3f1bab96c8b5afde012e41f5770d2671eefd1f86be81b576637994bffb5e00adab7ac2c986c09b7 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr --libdir=/lib - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index b7fe2869d..b317d0418 100755 --- a/make.sh +++ b/make.sh @@ -2120,7 +2120,6 @@ build_system() { lfsmake2 iftop lfsmake2 mdns-repeater lfsmake2 i2c-tools - lfsmake2 nss-myhostname lfsmake2 dehydrated lfsmake2 libplist lfsmake2 nqptp diff --git a/src/initscripts/system/localnet b/src/initscripts/system/localnet index ffa05e397..e696d9448 100644 --- a/src/initscripts/system/localnet +++ b/src/initscripts/system/localnet @@ -31,8 +31,17 @@ write_resolv_conf() { } write_hosts() { + local -A settings=() + + # Load settings + readhash settings "/var/ipfire/ethernet/settings" + ( echo "127.0.0.1 localhost.localdomain localhost" + + if [ -n "${settings["GREEN_ADDRESS"]}" ]; then + echo "${settings["GREEN_ADDRESS"]} ${HOSTNAME}.${DOMAINNAME} ${HOSTNAME}" + fi ) > /etc/hosts } hooks/post-receive -- IPFire 2.x development tree