--- fdi/90defaultpolicy/storage-policy.fdi~	2005-01-16 21:14:01.000000000 +0100
+++ fdi/90defaultpolicy/storage-policy.fdi	2005-01-16 21:22:48.000000000 +0100
@@ -6,11 +6,12 @@
   <device>
     <match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
       <merge key="storage.policy.default.mount_root" type="string">/media</merge>
-      <merge key="storage.policy.default.use_managed_keyword" type="bool">true</merge>
-      <merge key="storage.policy.default.managed_keyword.primary" type="string">managed</merge>
-      <merge key="storage.policy.default.managed_keyword.secondary" type="string">kudzu</merge>
+      <merge key="storage.policy.default.use_managed_keyword" type="bool">false</merge>
+      <merge key="storage.policy.default.managed_keyword.primary" type="string">fstabsync</merge>
+      <merge key="storage.policy.default.managed_keyword.secondary" type="string">managed</merge>
       <merge key="storage.policy.default.mount_option.noauto" type="bool">true</merge>
-      <merge key="storage.policy.default.mount_option.pamconsole" type="bool">true</merge>
+      <merge key="storage.policy.default.mount_option.pamconsole" type="bool">false</merge>
+      <merge key="storage.policy.default.mount_option.user" type="bool">true</merge>
       <merge key="storage.policy.default.mount_option.exec" type="bool">true</merge>
     </match>
   </device>
@@ -54,19 +55,19 @@
 	  <merge key="storage.policy.desired_mount_point" type="string">cdrecorder</merge>
 	</match>
 	<match key="storage.cdrom.dvdplusr" bool="true">
-	  <merge key="storage.policy.desired_mount_point" type="string">cdrecorder</merge>
+	  <merge key="storage.policy.desired_mount_point" type="string">dvdrecorder</merge>
 	</match>
 	<match key="storage.cdrom.dvdplusrw" bool="true">
-	  <merge key="storage.policy.desired_mount_point" type="string">cdrecorder</merge>
+	  <merge key="storage.policy.desired_mount_point" type="string">dvdrecorder</merge>
 	</match>
 	<match key="storage.cdrom.dvdram" bool="true">
-	  <merge key="storage.policy.desired_mount_point" type="string">cdrecorder</merge>
+	  <merge key="storage.policy.desired_mount_point" type="string">dvdrecorder</merge>
 	</match>
 	<match key="storage.cdrom.dvdr" bool="true">
-	  <merge key="storage.policy.desired_mount_point" type="string">cdrecorder</merge>
+	  <merge key="storage.policy.desired_mount_point" type="string">dvdrecorder</merge>
 	</match>
 	<match key="storage.cdrom.dvdrw" bool="true">
-	  <merge key="storage.policy.desired_mount_point" type="string">cdrecorder</merge>
+	  <merge key="storage.policy.desired_mount_point" type="string">dvdrecorder</merge>
 	</match>
 	<match key="/org/freedesktop/Hal/devices/computer:linux.is_selinux_enabled" bool="true">
 	  <merge key="storage.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>