From 55c3a0f128e1a1197c437307bd600af09ac936dd Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Wed, 29 Oct 2008 14:53:25 +0000
Subject: [PATCH] fix hal fdi file

---
 20-ntfs-config-write-policy.fdi | 8 +++-----
 ntfs-3g.spec                    | 5 ++++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/20-ntfs-config-write-policy.fdi b/20-ntfs-config-write-policy.fdi
index 748821e..82731c5 100644
--- a/20-ntfs-config-write-policy.fdi
+++ b/20-ntfs-config-write-policy.fdi
@@ -2,11 +2,9 @@
 <deviceinfo version="0.2">
    <device>
        <match key="volume.fstype" string="ntfs">
-           <match key="@block.storage_device:storage.hotpluggable" bool="true">
-               <merge key="volume.fstype" type="string">ntfs-3g</merge>
-               <merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
-               <append key="volume.mount.valid_options" type="strlist">locale=</append>
-           </match>
+           <merge key="volume.fstype" type="string">ntfs-3g</merge>
+           <merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
+           <append key="volume.mount.valid_options" type="strlist">locale=</append>
        </match>
    </device>
 </deviceinfo>
diff --git a/ntfs-3g.spec b/ntfs-3g.spec
index 72d75b9..5e3ed1e 100644
--- a/ntfs-3g.spec
+++ b/ntfs-3g.spec
@@ -5,7 +5,7 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	1.5012
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ntfs-3g.org/ntfs-3g-%{version}.tgz
@@ -128,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Wed Oct 29 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2:1.5012-3
+- fix hal file to cover all mount cases (thanks to Richard Hughes)
+
 * Mon Oct 20 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2:1.5012-2
 - add fdi file to enable hal automounting