From 7106b644b86b43c56015896306194b1a1764dfc9 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 29 Nov 2023 08:13:56 +0000
Subject: [PATCH 1/3] nss-mdns: enable systemd-userdbd

---
 packages/network/nss-mdns/config/nsswitch.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/network/nss-mdns/config/nsswitch.conf b/packages/network/nss-mdns/config/nsswitch.conf
index 2c405773c7..d399c0ff42 100644
--- a/packages/network/nss-mdns/config/nsswitch.conf
+++ b/packages/network/nss-mdns/config/nsswitch.conf
@@ -3,10 +3,10 @@
 # Example configuration of GNU Name Service Switch functionality.
 #
 
-passwd:		files
-group:		files
-shadow:		files
-gshadow:	files
+passwd:		files systemd
+group:		files [SUCCESS=merge] systemd
+shadow:		files systemd
+gshadow:	files systemd
 
 hosts:		files mdns_minimal [NOTFOUND=return] dns
 networks:	files dns

From 0f8d8410c50daff1f76614b6ab6f83908f4dd571 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Tue, 28 Nov 2023 07:11:43 +0000
Subject: [PATCH 2/3] systemd: enable systemd-userdbd and nss-systemd for users
 and groups

new files:
-rwxr-xr-x 1 root root  39152 Mar  5 09:41 /usr/bin/userdbctl
-rwxr-xr-x 1 root root 404000 Mar  5 09:41 /usr/lib/libnss_systemd.so.2
-rwxr-xr-x 1 root root  18504 Mar  5 09:41 /usr/lib/systemd/systemd-userdbd
-rwxr-xr-x 1 root root  22600 Mar  5 09:41 /usr/lib/systemd/systemd-userwork
-rw-r--r-- 1 root root   1204 Mar  5 09:41 /usr/lib/systemd/system/systemd-userdbd.service
-rw-r--r-- 1 root root    691 Feb 27 17:26 /usr/lib/systemd/system/systemd-userdbd.socket
---
 packages/sysutils/systemd/package.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk
index cfb5ebead5..9612dcb1be 100644
--- a/packages/sysutils/systemd/package.mk
+++ b/packages/sysutils/systemd/package.mk
@@ -65,7 +65,8 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \
                        -Dlocaled=false \
                        -Dmachined=false \
                        -Dportabled=false \
-                       -Duserdb=false \
+                       -Duserdb=true \
+                       -Dnologin-path=/usr/sbin/nologin \
                        -Dhomed=disabled \
                        -Dnetworkd=false \
                        -Dtimedated=false \
@@ -88,7 +89,7 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \
                        -Dnss-myhostname=false \
                        -Dnss-mymachines=disabled \
                        -Dnss-resolve=disabled \
-                       -Dnss-systemd=false \
+                       -Dnss-systemd=true \
                        -Dman=disabled \
                        -Dhtml=disabled \
                        -Dlink-udev-shared=true \
@@ -303,4 +304,5 @@ post_install() {
   enable_service network-base.service
   enable_service systemd-timesyncd.service
   enable_service systemd-timesyncd-setup.service
+  enable_service systemd-userdbd.socket
 }

From 90f02c15a6b0755c418d994a8d85e4b15a92217c Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Tue, 17 Dec 2024 11:38:11 +0000
Subject: [PATCH 3/3] util-linux: include nologin

---
 packages/sysutils/util-linux/package.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk
index ed27f8f66d..6c5aed354f 100644
--- a/packages/sysutils/util-linux/package.mk
+++ b/packages/sysutils/util-linux/package.mk
@@ -56,7 +56,8 @@ PKG_CONFIGURE_OPTS_TARGET="${UTILLINUX_CONFIG_DEFAULT} \
                            --enable-blkid \
                            --enable-lscpu \
                            --enable-lsfd \
-                           --enable-mount"
+                           --enable-mount \
+                           --enable-nologin"
 
 if [ "${SWAP_SUPPORT}" = "yes" ]; then
   PKG_CONFIGURE_OPTS_TARGET+=" --enable-swapon"