fix(udev-rules): move relevant rules from systemd

Also install elogind into Alpine and Void containers.

diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
index fb8a8200b2d9435a860fd5898b0e565e2ecc1523..72c3c5dde73a10f2d6a7647581a6a0bb24f56321 100755 (executable)
--- a/modules.d/00systemd/module-setup.sh
+++ b/modules.d/00systemd/module-setup.sh
@@ -139,9 +139,6 @@ EOF
     ln_r "$(find_binary true)" "/usr/bin/loginctl"
     ln_r "$(find_binary true)" "/bin/loginctl"
     inst_rules \
-        70-uaccess.rules \
-        71-seat.rules \
-        73-seat-late.rules \
         90-vconsole.rules \
         99-systemd.rules
 

diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
index 608050c3221cc9c5353ac95a1b1d2eff4d94591c..1f4acb2d13e8d7d35e332de2028b8d3d0e99d16b 100755 (executable)
--- a/modules.d/95udev-rules/module-setup.sh
+++ b/modules.d/95udev-rules/module-setup.sh
@@ -48,6 +48,9 @@ install() {
         70-memory.rules \
         70-mouse.rules \
         70-touchpad.rules \
+        70-uaccess.rules \
+        71-seat.rules \
+        73-seat-late.rules \
         75-net-description.rules \
         75-probe_mtd.rules \
         78-sound-card.rules \

diff --git a/test/container/Dockerfile-alpine b/test/container/Dockerfile-alpine
index 91759c37e1a85fbff5e46d2585c4721c96fdc398..1af057cf5a0e905564d117ded54dbc23cd58bbdf 100644 (file)
--- a/test/container/Dockerfile-alpine
+++ b/test/container/Dockerfile-alpine
@@ -27,6 +27,7 @@ RUN apk add --no-cache \
     dosfstools \
     dracut \
     e2fsprogs \
+    elogind \
     erofs-utils \
     eudev \
     file \

diff --git a/test/container/Dockerfile-void b/test/container/Dockerfile-void
index dc115235562daaf97e98d7c7e3a4e51196af785f..b2d0c8dcc66c24b575bebc88dfe1889a1945b96f 100644 (file)
--- a/test/container/Dockerfile-void
+++ b/test/container/Dockerfile-void
@@ -23,6 +23,7 @@ RUN xbps-install -Syu xbps && xbps-install -yu \
     e2fsprogs \
     edk2-ovmf \
     elfutils \
+    elogind \
     erofs-utils \
     eudev \
     f2fs-tools \