View | Details | Raw Unified | Return to bug 293433
Collapse All | Expand All

(-)file_not_specified_in_diff (-1 / +19 lines)
Line  Link Here
0
-- hal-0.5.9_git20070816/fdi/policy/10osvendor/20-storage-methods.fdi
0
++ hal-0.5.9_git20070816/fdi/policy/10osvendor/20-storage-methods.fdi
Lines 249-254 Link Here
249
	</match>
249
	</match>
250
      </match>
250
      </match>
251
251
252
      <!-- allow these mount options for ntfs-3g -->
253
      <match key="volume.fstype" string="ntfs-3g">
254
	<append key="volume.mount.valid_options" type="strlist">force</append>
255
	<append key="volume.mount.valid_options" type="strlist">locale=</append>
256
	<append key="volume.mount.valid_options" type="strlist">uid=</append>
257
	<append key="volume.mount.valid_options" type="strlist">gid=</append>
258
	<append key="volume.mount.valid_options" type="strlist">umask=</append>
259
	<append key="volume.mount.valid_options" type="strlist">dmask=</append>
260
	<append key="volume.mount.valid_options" type="strlist">fmask=</append>
261
	<append key="volume.mount.valid_options" type="strlist">allow_other</append>
262
	<append key="volume.mount.valid_options" type="strlist">no_def_opts</append>
263
	<append key="volume.mount.valid_options" type="strlist">silent</append>
264
	<append key="volume.mount.valid_options" type="strlist">show_sys_files</append>
265
	<append key="volume.mount.valid_options" type="strlist">max_read=</append>
266
	<append key="volume.mount.valid_options" type="strlist">streams_interface=</append>
267
      </match>
268
252
      <!-- allow these mount options for ext3 -->
269
      <!-- allow these mount options for ext3 -->
253
      <match key="volume.fstype" string="ext3">
270
      <match key="volume.fstype" string="ext3">
254
	<append key="volume.mount.valid_options" type="strlist">acl</append>
271
	<append key="volume.mount.valid_options" type="strlist">acl</append>
255
		if (strcmp (libhal_volume_get_fstype (volume), "vfat") != 0 &&
272
		if (strcmp (libhal_volume_get_fstype (volume), "vfat") != 0 &&
256
		    strcmp (libhal_volume_get_fstype (volume), "iso9660") != 0 &&
273
		    strcmp (libhal_volume_get_fstype (volume), "iso9660") != 0 &&
257
		    strcmp (libhal_volume_get_fstype (volume), "ntfs") != 0 &&
274
		    strcmp (libhal_volume_get_fstype (volume), "ntfs") != 0 &&
275
		    strcmp (libhal_volume_get_fstype (volume), "ntfs-3g") != 0 &&
258
		    strcmp (libhal_volume_get_fstype (volume), "hfs") != 0 &&
276
		    strcmp (libhal_volume_get_fstype (volume), "hfs") != 0 &&
259
		    strcmp (libhal_volume_get_fstype (volume), "udf") != 0) {
277
		    strcmp (libhal_volume_get_fstype (volume), "udf") != 0) {
260
			pol_change_uid = wants_to_change_uid;
278
			pol_change_uid = wants_to_change_uid;

Return to bug 293433