From a4e48686a678c0043acbe12b93662c0944cecf2a Mon Sep 17 00:00:00 2001
From: DJ Lucas <dj@linuxfromscratch.org>
Date: Wed, 15 Oct 2008 03:02:25 +0000
Subject: [PATCH] Override floppy rules in udev-130.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8663 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml  | 5 ++++-
 general.ent              | 4 ++--
 packages.ent             | 2 +-
 udev-config/55-lfs.rules | 4 ++++
 udev-config/ChangeLog    | 5 +++++
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 87e3830d5..31ef35e9e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,8 +38,11 @@
 -->
 
     <listitem>
-      <para>2008-10-14</para>
+      <para>2008-10-15</para>
       <itemizedlist>
+        <listitem>
+          <para>[dj] - Updated to udev-config-20081015.</para>
+        </listitem>
         <listitem>
           <para>[dj] - Modified udev instructions following upstream
           recommendations.</para>
diff --git a/general.ent b/general.ent
index ce9a5ee47..7cf7c0b28 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20081014">
-<!ENTITY releasedate "October 14, 2008">
+<!ENTITY version "SVN-20081015">
+<!ENTITY releasedate "October 15, 2008">
 <!ENTITY copyrightdate "1999&ndash;2008">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 5e1f080c1..521ac4a30 100644
--- a/packages.ent
+++ b/packages.ent
@@ -514,7 +514,7 @@
 <!ENTITY udev-ch6-du "10 MB">
 <!ENTITY udev-ch6-sbu "0.2 SBU">
 
-<!ENTITY udev-config "udev-config-20080522"> <!-- Scripts depend on this format -->
+<!ENTITY udev-config "udev-config-20081015"> <!-- Scripts depend on this format -->
 <!ENTITY udev-config-size "UDEV-SIZE KB">    <!-- Updated in Makefile -->
 <!ENTITY udev-config-url "&downloads-root;&udev-config;.tar.bz2">
 <!ENTITY udev-config-md5 "UDEV-MD5SUM">      <!-- Updated in Makefile -->
diff --git a/udev-config/55-lfs.rules b/udev-config/55-lfs.rules
index d920008fc..a1750150d 100644
--- a/udev-config/55-lfs.rules
+++ b/udev-config/55-lfs.rules
@@ -99,3 +99,7 @@ KERNEL=="pt[0-9]*",     GROUP="tape"
 KERNEL=="npt[0-9]*",    GROUP="tape"
 KERNEL=="st[0-9]*",     GROUP="tape"
 KERNEL=="nst[0-9]*",    GROUP="tape"
+
+# Override floppy devices
+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"
diff --git a/udev-config/ChangeLog b/udev-config/ChangeLog
index c7a0df19a..2d9406758 100644
--- a/udev-config/ChangeLog
+++ b/udev-config/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-14	DJ Lucas	<dj@linuxfromscratch.org>
+	* 55-lfs.rules: Override default perms on floppy disk devices provided
+	  by 50-udev-default.rules.  Thanks to Bruce Dubbs for the fix.  Closes
+	  LFS ticket #2076. 
+
 2008-05-21	Bryan Kadzban	<bryan@linuxfromscratch.org>
 	* 81-firmware.rules, doc/81-firmware.txt: Remove.  This rule is
 	  already handled by udev's 50-udev-default.rules file.  The docs