From 089b19e4124f921cc3d441e306e7e9ca792fa7a1 Mon Sep 17 00:00:00 2001
From: "Dustin C. Hatch" <dustin@hatch.name>
Date: Sun, 26 Mar 2023 11:52:26 -0500
Subject: [PATCH] Copy all files from /usr/${target} to /usr

It turns out there are actually several packages that install files to
$SYSROOT instead of $ROOT, not just udev rules.
---
 build-rootfs.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/build-rootfs.sh b/build-rootfs.sh
index 6325db3..d21924b 100755
--- a/build-rootfs.sh
+++ b/build-rootfs.sh
@@ -65,10 +65,8 @@ fi
 
 cp -uv /usr/${target}/usr/bin/grub-editenv /mnt/gentoo/usr/bin/
 
-if [ -d /mnt/gentoo/usr/${target}/usr/lib/udev/rules.d ]; then
-    find /mnt/gentoo/usr/${target}/usr/lib/udev/rules.d \
-        -name '*.rules' \
-        -exec mv -t /mnt/gentoo/usr/lib/udev/rules.d/ {} +
+if [ -d /mnt/gentoo/usr/${target} ]; then
+    rsync -aO /mnt/gentoo/usr/${target}/ /mnt/gentoo/
 fi
 
 if [ -f /mnt/gentoo/etc/udev/hwdb.bin ]; then