From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Mon, 14 Mar 2022 16:56:04 +0000 (+0000)
Subject: fix(udev-rules): add cdrom udev rules by default
X-Git-Tag: 057~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aebeb2ecdf76b7716fadbab8b216b8805d36a461;p=thirdparty%2Fdracut.git

fix(udev-rules): add cdrom udev rules by default

Include cdrom udev rules by default, even if
systemd-udevd or dmsquash-live dracut modules
are not installed.
---

diff --git a/modules.d/90dmsquash-live/module-setup.sh b/modules.d/90dmsquash-live/module-setup.sh
index 65766e830..dc35ba657 100755
--- a/modules.d/90dmsquash-live/module-setup.sh
+++ b/modules.d/90dmsquash-live/module-setup.sh
@@ -35,7 +35,5 @@ install() {
         inst_script "$moddir/dmsquash-generator.sh" "$systemdutildir"/system-generators/dracut-dmsquash-generator
         inst_simple "$moddir/checkisomd5@.service" "/etc/systemd/system/checkisomd5@.service"
     fi
-    # should probably just be generally included
-    inst_rules 60-cdrom_id.rules
     dracut_need_initqueue
 }
diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
index a136eed82..af2ab09bd 100755
--- a/modules.d/95udev-rules/module-setup.sh
+++ b/modules.d/95udev-rules/module-setup.sh
@@ -35,6 +35,7 @@ install() {
         58-scsi-sg3_symlink.rules \
         59-scsi-sg3_utils.rules \
         60-block.rules \
+        60-cdrom_id.rules \
         60-pcmcia.rules \
         60-persistent-storage.rules \
         61-persistent-storage-edd.rules \