From e6694b04bf9e089bb13c5930ec16aebb360e1498 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Mon, 20 Oct 2008 17:03:54 +0000
Subject: [PATCH] fix automount failure, locale option failure

---
 20-ntfs-config-write-policy.fdi | 13 +++++++++++++
 ntfs-3g.spec                    | 10 +++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 20-ntfs-config-write-policy.fdi

diff --git a/20-ntfs-config-write-policy.fdi b/20-ntfs-config-write-policy.fdi
new file mode 100644
index 0000000..748821e
--- /dev/null
+++ b/20-ntfs-config-write-policy.fdi
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<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>
+       </match>
+   </device>
+</deviceinfo>
+
diff --git a/ntfs-3g.spec b/ntfs-3g.spec
index 8e14bbb..72d75b9 100644
--- a/ntfs-3g.spec
+++ b/ntfs-3g.spec
@@ -5,10 +5,11 @@
 Name:		ntfs-3g
 Summary: 	Linux NTFS userspace driver 
 Version:	1.5012
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ntfs-3g.org/ntfs-3g-%{version}.tgz
+Source1:	20-ntfs-config-write-policy.fdi
 Patch0:		ntfs-3g-1.2216-nomtab.patch
 URL:		http://www.ntfs-3g.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -95,6 +96,9 @@ mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig/libntfs-3g.pc $RPM_BUILD_ROOT%{_libdir}/pkg
 # We get this on our own, thanks.
 rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/README
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor/
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -115,6 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ntfsmount
 /%{_lib}/libntfs-3g.so.*
 %{_mandir}/man8/*
+%{_datadir}/hal/fdi/policy/10osvendor/20-ntfs-config-write-policy.fdi
 
 %files devel
 %defattr(-,root,root,-)
@@ -123,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Mon Oct 20 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2:1.5012-2
+- add fdi file to enable hal automounting
+
 * Wed Oct 15 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2:1.5012-1
 - update to 1.5012 (same code as 1.2926-RC)