From: Doug Goldstein <cardoe@gentoo.org>
Date: Wed, 18 Apr 2007 20:58:29 +0000 (+0000)
Subject: ignored volumes clean up
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4fdcacd56cd2831c16f6a60789182972927a6c40;p=gentoo.git

ignored volumes clean up
Package-Manager: portage-2.1.2.4
---

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 45bcb04a56a8..b2096d608503 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.170 2007/04/18 14:31:07 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.171 2007/04/18 20:58:29 cardoe Exp $
+
+  18 Apr 2007; Doug Goldstein <cardoe@gentoo.org>
+  files/0.5.9/97_ignore_fixed_drives.patch:
+  ignored volumes clean up
 
   18 Apr 2007; Doug Goldstein <cardoe@gentoo.org>
   +files/0.5.9/13_detect_newer_macbooks.patch,
diff --git a/sys-apps/hal/files/0.5.9/97_ignore_fixed_drives.patch b/sys-apps/hal/files/0.5.9/97_ignore_fixed_drives.patch
index 70f79b84e6e9..acc0b4df8cbe 100644
--- a/sys-apps/hal/files/0.5.9/97_ignore_fixed_drives.patch
+++ b/sys-apps/hal/files/0.5.9/97_ignore_fixed_drives.patch
@@ -1,31 +1,33 @@
 Index: b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi	2007-04-18 10:14:56.000000000 -0400
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF8"?> <!-- -*- SGML -*- -->
++++ b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi	2007-04-18 16:53:05.000000000 -0400
+@@ -0,0 +1,21 @@
++<?xml version="1.0" encoding="UTF-8"?>
 +
 +<deviceinfo version="0.2">
 +  <device>
-+    <match key="@block.storage_device:storage.hotpluggable" bool="false">
-+      <match key="@block.storage_device:storage.removable" bool="false">
-+        <match key="volume.is_mounted" bool="true">
-+	  <merge key="volume.ignore" type="bool">true</merge>
-+	  <!-- Show /media/ mounted devices -->
-+	  <match key="volume.mount_point" compare_gt="/media">
-+	    <match key="volume.mount_point" compare_lt="/media0">
-+	      <merge key="volume.ignore" type="bool">false</merge>
-+	    </match>
-+	  </match>
-+	</match>
++    <match key="volume.fsusage" string="filesystem">
++      <match key="@block.storage_device:storage.hotpluggable" bool="false">
++        <match key="@block.storage_device:storage.removable" bool="false">
++          <match key="volume.is_mounted" bool="true">
++            <merge key="volume.ignore" type="bool">true</merge>
++            <!-- Show /media/ mounted devices -->
++            <match key="volume.mount_point" compare_gt="/media">
++              <match key="volume.mount_point" compare_lt="/media0">
++                <merge key="volume.ignore" type="bool">false</merge>
++              </match>
++            </match>
++          </match>
++        </match>
 +      </match>
 +    </match>
 +  </device>
 +</deviceinfo>
 Index: b/fdi/policy/10osvendor/Makefile.am
 ===================================================================
---- a/fdi/policy/10osvendor/Makefile.am	2007-03-30 15:03:33.000000000 -0400
-+++ b/fdi/policy/10osvendor/Makefile.am	2007-04-18 10:16:27.000000000 -0400
+--- a/fdi/policy/10osvendor/Makefile.am	2007-04-18 10:17:26.000000000 -0400
++++ b/fdi/policy/10osvendor/Makefile.am	2007-04-18 16:45:07.000000000 -0400
 @@ -7,7 +7,8 @@
  	10-rfkill-switch.fdi		\
  	10-laptop-panel-mgmt-policy.fdi	\