[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 92b0883545200119c9403dd516084fed388201a0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 92b0883545200119c9403dd516084fed388201a0

[Michael Tremer]

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  92b0883545200119c9403dd516084fed388201a0 (commit)
       via  d5278b7051fd7755008956c170e08fcdf3da6cab (commit)
      from  0f955c616a29b66c4ac9024608cc85eda9345864 (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 92b0883545200119c9403dd516084fed388201a0
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Sat Mar 7 10:56:40 2026 +0000

    dns: Create /var/ipfire/dns/custom_domains
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit d5278b7051fd7755008956c170e08fcdf3da6cab
Author: Adolf Belka <adolf.belka@ipfire.org>
Date:   Fri Mar 6 20:05:24 2026 +0100

    clamav: Fix rootfile
    
    - I missed to remove the - in front of the clamavctrl which always occurs with the
       clamav rootfile.
    - This patch corrects that.
    
    Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/configroot  | 1 +
 config/rootfiles/core/201/update.sh | 7 ++++++-
 config/rootfiles/packages/clamav    | 2 +-
 lfs/configroot                      | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 1be0e09cb..7cc93302f 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -40,6 +40,7 @@ var/ipfire/dhcp
 #var/ipfire/dhcp/settings
 var/ipfire/dhcpc
 var/ipfire/dns
+var/ipfire/dns/custom_domains
 var/ipfire/dns/dnsbl
 var/ipfire/dns/dnsbl.json
 #var/ipfire/dns/servers
diff --git a/config/rootfiles/core/201/update.sh b/config/rootfiles/core/201/update.sh
index 87a588031..e9c68acae 100644
--- a/config/rootfiles/core/201/update.sh
+++ b/config/rootfiles/core/201/update.sh
@@ -64,12 +64,17 @@ telinit u
 # Apply SSH configuration
 /usr/local/bin/sshctrl
 
-# Create the dnsbl configuration file if it does not exist
+# Create the dnsbl configuration files if it does not exist
 if [ ! -e "/var/ipfire/dns/dnsbl" ]; then
 	touch /var/ipfire/dns/dnsbl
 	chown nobody:nobody /var/ipfire/dns/dnsbl
 fi
 
+if [ ! -e "/var/ipfire/dns/custom_domains" ]; then
+	touch /var/ipfire/dns/custom_domains
+	chown nobody:nobody /var/ipfire/dns/custom_domains
+fi
+
 # Start services
 /etc/init.d/openvpn-rw restart
 /etc/init.d/openvpn-n2n restart
diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 8cef24999..0fe438477 100644
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -172,4 +172,4 @@ var/ipfire/clamav/clamd.conf.sample
 var/ipfire/clamav/freshclam.conf
 var/ipfire/clamav/freshclam.conf.sample
 var/lib/clamav
--usr/local/bin/clamavctrl
+usr/local/bin/clamavctrl
diff --git a/lfs/configroot b/lfs/configroot
index 86181e90b..b4f412a8a 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -63,7 +63,7 @@ $(TARGET) :
 	# Touch empty files
 	for i in auth/users backup/include.user backup/exclude.user \
 	    captive/settings captive/agb.txt captive/clients captive/voucher_out certs/index.txt certs/index.txt.attr ddns/config ddns/settings ddns/ipcache dhcp/settings \
-	    dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/dnsbl dns/settings dns/servers dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
+	    dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/custom_domains dns/dnsbl dns/settings dns/servers dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
 	    ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/locationblock firewall/input firewall/outgoing \
 	    fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsettings ipblocklist/modified \
 	    ipblocklist/settings lldp/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \


hooks/post-receive
--
IPFire 2.x development tree