floppy: fix rule to create additional floppy device nodes

diff --git a/Makefile.am b/Makefile.am
index 4435398e72c48e55cba4cfc9dc15c7e1cc4ff4f2..62fe5a0f0761162ccb7923d78d8fd89aa1bc3d79 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -235,6 +235,7 @@ dist_udevrules_DATA += extras/edd_id/61-persistent-storage-edd.rules
 extras_floppy_create_floppy_devices_SOURCES = extras/floppy/create_floppy_devices.c
 extras_floppy_create_floppy_devices_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/floppy/create_floppy_devices
+dist_udevrules_DATA += extras/floppy/60-floppy.rules
 
 # ------------------------------------------------------------------------------
 # input_id - import input device class

diff --git a/extras/floppy/60-floppy.rules b/extras/floppy/60-floppy.rules
new file mode 100644 (file)
index 0000000..3123bb5
--- /dev/null
+++ b/extras/floppy/60-floppy.rules
@@ -0,0 +1,4 @@
+# do not edit this file, it will be overwritten on update
+
+SUBSYSTEM=="block", KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", ENV{CMOS_TYPE}="$attr{cmos}", \
+  RUN+="create_floppy_devices -c -t $env{CMOS_TYPE} -m %M -M 0640 -G floppy $root/%k"

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index 00c73dfe8610dafe5f4453213ceed9110bca47fd..f01fc0373683a4965d7f706cec690182364afeda 100644 (file)
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -74,7 +74,6 @@ SUBSYSTEM=="block", GROUP="disk"
 
 # floppy
 KERNEL=="fd[0-9]", GROUP="floppy"
-KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0660 -G floppy $root/%k"
 
 # cdrom
 SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom"