[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0ab11cbb2954f17f9fd9c02aef7b31a04450598a

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0ab11cbb2954f17f9fd9c02aef7b31a04450598a

[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  0ab11cbb2954f17f9fd9c02aef7b31a04450598a (commit)
       via  d030f69a35377cc0655ed3b87fd8957688ace225 (commit)
      from  091050ab1610a60a7bd0c00bc35dd09faf925e4c (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 0ab11cbb2954f17f9fd9c02aef7b31a04450598a
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Mon Jun 1 09:28:05 2026 +0000

    core203: Create /var/run/knot-resolver in updater
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit d030f69a35377cc0655ed3b87fd8957688ace225
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Mon Jun 1 09:10:41 2026 +0000

    knot resolver: Mover user to UID/GID 120
    
    Fixes: #14002 - User id 119 has been used for tor user in the past
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

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

Summary of changes:
 config/backup/backup.pl             |  4 ++--
 config/etc/group                    |  2 +-
 config/etc/passwd                   |  2 +-
 config/rootfiles/core/203/update.sh | 10 ++++++++--
 4 files changed, 12 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index e899d7139..7454ae762 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -118,7 +118,7 @@ restore_backup() {
 
 	# Create Knot Resolver group
 	if ! getent group knot-resolver &>/dev/null; then
-		groupadd -g 119 knot-resolver
+		groupadd -g 120 knot-resolver
 	fi
 
 	# Create Knot Resolver user
@@ -128,7 +128,7 @@ restore_backup() {
 			-d /var/empty \
 			-g knot-resolver \
 			-s /bin/false \
-			-u 119 \
+			-u 120 \
 			knot-resolver
 	fi
 
diff --git a/config/etc/group b/config/etc/group
index 5087e0a0d..8ba642e5e 100644
--- a/config/etc/group
+++ b/config/etc/group
@@ -44,5 +44,5 @@ nut:x:115:
 cdrom:x:116:
 usb:x:117:
 zabbix:x:118:
-knot-resolver:x:119:
+knot-resolver:x:120:
 samba:x:1000:
diff --git a/config/etc/passwd b/config/etc/passwd
index 759568810..a25c79890 100644
--- a/config/etc/passwd
+++ b/config/etc/passwd
@@ -23,5 +23,5 @@ cyrus:x:111:12:Cyrus user:/usr/cyrus:
 filter:x:112:12:Spam user:/home/filter:/bin/false
 asterisk:x:114:114:Asterisk user:/var/empty:/bin/false
 zabbix:x:118:118:Zabbix Monitoring:/var/empty:/bin/false
-knot-resolver:x:119:119:Knot Resolver User:/var/empty:/bin/false
+knot-resolver:x:120:120:Knot Resolver User:/var/empty:/bin/false
 samba:x:1000:1000:Samba User:/var/empty:/bin/false
diff --git a/config/rootfiles/core/203/update.sh b/config/rootfiles/core/203/update.sh
index d920c12a1..e8d9b2a37 100644
--- a/config/rootfiles/core/203/update.sh
+++ b/config/rootfiles/core/203/update.sh
@@ -51,7 +51,7 @@ done
 
 # Create Knot Resolver group
 if ! getent group knot-resolver &>/dev/null; then
-	groupadd -g 119 knot-resolver
+	groupadd -g 120 knot-resolver
 fi
 
 # Create Knot Resolver user
@@ -61,10 +61,16 @@ if ! getent passwd knot-resolver &>/dev/null; then
 		-d /var/empty \
 		-g knot-resolver \
 		-s /bin/false \
-		-u 119 \
+		-u 120 \
 		knot-resolver
 fi
 
+# Create /var/run/knot-resolver
+if [ -d "/var/run/knot-resolver" ]; then
+	mkdir /var/run/knot-resolver
+	chown knot-resolver:knot-resolver /var/run/knot-resolver
+fi
+
 # Extract files
 extract_files
 


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