From 329f11b4dad525965b20e30927e4956759ead6d9 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Thu, 1 Jan 2026 09:45:06 +0100
Subject: [PATCH] test: add barebones /etc/{passwd,group} and an ld.so.conf

Finit now requires being able to query at least for the root user and
group before starting any services.

Also, add support for using libraries installed in /usr/local

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 test/Makefile.am         | 1 +
 test/setup-sysroot.sh    | 3 +++
 test/skel/etc/group      | 9 +++++++++
 test/skel/etc/ld.so.conf | 3 +++
 test/skel/etc/passwd     | 5 +++++
 5 files changed, 21 insertions(+)
 create mode 100644 test/skel/etc/group
 create mode 100644 test/skel/etc/ld.so.conf
 create mode 100644 test/skel/etc/passwd

diff --git a/test/Makefile.am b/test/Makefile.am
index f2baf0cd..ca965ed2 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -10,6 +10,7 @@ EXTRA_DIST		 = skel/bin/busybox-x86_64.sha256 skel/sbin/service.sh skel/etc/env
 			   skel/etc/rcS.d/S01abc.sh skel/etc/rcS.d/S02def.sh		    \
 			   skel/cdrom/.empty skel/dev/shm/.empty skel/dev/pts/.empty	    \
 			   skel/etc/inittab skel/etc/hostname skel/etc/fstab 		    \
+			   skel/etc/passwd skel/etc/group skel/etc/ld.so.conf		    \
 			   skel/etc/init.d/rcS skel/etc/init.d/rcK skel/tmp/.empty	    \
 			   skel/etc/finit.d/.empty skel/etc/finit.d/available/.empty	    \
 			   skel/etc/finit.d/enabled/.empty 				    \
diff --git a/test/setup-sysroot.sh b/test/setup-sysroot.sh
index c0fcdbdb..69e04f33 100755
--- a/test/setup-sysroot.sh
+++ b/test/setup-sysroot.sh
@@ -21,3 +21,6 @@ done
 for conf in 10-hotplug.conf; do
     find "$SYSROOT" -name $conf -delete
 done
+
+# Update dynamic linker cache for /usr/local/lib libraries
+ldconfig -r "$SYSROOT"
diff --git a/test/skel/etc/group b/test/skel/etc/group
new file mode 100644
index 00000000..696ac862
--- /dev/null
+++ b/test/skel/etc/group
@@ -0,0 +1,9 @@
+root:x:0:
+daemon:x:1:
+bin:x:2:
+sys:x:3:
+adm:x:4:
+tty:x:5:
+disk:x:6:
+dialout:x:20:
+nogroup:x:65534:
diff --git a/test/skel/etc/ld.so.conf b/test/skel/etc/ld.so.conf
new file mode 100644
index 00000000..cdaa002c
--- /dev/null
+++ b/test/skel/etc/ld.so.conf
@@ -0,0 +1,3 @@
+/usr/local/lib
+/usr/lib
+/lib
diff --git a/test/skel/etc/passwd b/test/skel/etc/passwd
new file mode 100644
index 00000000..2933891f
--- /dev/null
+++ b/test/skel/etc/passwd
@@ -0,0 +1,5 @@
+root:x:0:0:root:/root:/bin/sh
+daemon:x:1:1:daemon:/usr/sbin:/usr/sbin/nologin
+bin:x:2:2:bin:/bin:/usr/sbin/nologin
+sys:x:3:3:sys:/dev:/usr/sbin/nologin
+nobody:x:65534:65534:nobody:/nonexistent:/usr/sbin/nologin