From: Yu Watanabe Date: Fri, 1 Aug 2025 09:13:24 +0000 (+0900) Subject: mkosi-initrd: move udev rules files for dm and md X-Git-Tag: v26~163 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=655baf24474a6f0732ec1b82a71c2f6fe4eeeb49;p=thirdparty%2Fmkosi.git mkosi-initrd: move udev rules files for dm and md 10-mkosi-initrd-dm.rules is used not only by LVM, but generic DM devices. Hence, it must be in the base image. 10-mkosi-initrd-md.rules is used by MD raid, hence it must be in the raid profile. Follow-ups for b8bda09866bd64d99157010b4566c9872bb844b6 and 686f57d7f91f1c71bb10a69474e1ca795287bc71. Fixes https://github.com/systemd/systemd/issues/36162. --- diff --git a/REUSE.toml b/REUSE.toml index 37ae793f4..b096c61fc 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -44,8 +44,8 @@ SPDX-License-Identifier = "LGPL-2.1-or-later" [[annotations]] path = [ - "mkosi/resources/mkosi-initrd/mkosi.profiles/lvm/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-md.rules", - "mkosi/resources/mkosi-initrd/mkosi.profiles/lvm/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-dm.rules", + "mkosi/resources/mkosi-initrd/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-dm.rules", + "mkosi/resources/mkosi-initrd/mkosi.profiles/raid/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-md.rules", ] precedence = "aggregate" SPDX-FileCopyrightText = "Mkosi Contributors" diff --git a/mkosi/resources/mkosi-initrd/mkosi.profiles/lvm/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-dm.rules b/mkosi/resources/mkosi-initrd/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-dm.rules similarity index 100% rename from mkosi/resources/mkosi-initrd/mkosi.profiles/lvm/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-dm.rules rename to mkosi/resources/mkosi-initrd/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-dm.rules diff --git a/mkosi/resources/mkosi-initrd/mkosi.profiles/lvm/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-md.rules b/mkosi/resources/mkosi-initrd/mkosi.profiles/raid/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-md.rules similarity index 100% rename from mkosi/resources/mkosi-initrd/mkosi.profiles/lvm/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-md.rules rename to mkosi/resources/mkosi-initrd/mkosi.profiles/raid/mkosi.extra/usr/lib/udev/rules.d/10-mkosi-initrd-md.rules