Annotation of /trunk/hal/patches/hal-0.5.12-storage-mount-fix-2.patch
Parent Directory | Revision Log
Revision 855 -
(hide annotations)
(download)
Tue Jun 16 23:15:02 2009 UTC (15 years, 3 months ago) by niro
File size: 1454 byte(s)
Tue Jun 16 23:15:02 2009 UTC (15 years, 3 months ago) by niro
File size: 1454 byte(s)
-re-diffed to work with our hal
1 | niro | 855 | diff -Naur hal-0.5.12/hald/linux/probing/probe-volume.c hal-0.5.12-magellan/hald/linux/probing/probe-volume.c |
2 | --- hal-0.5.12/hald/linux/probing/probe-volume.c 2009-05-10 21:11:44.000000000 +0200 | ||
3 | +++ hal-0.5.12-magellan/hald/linux/probing/probe-volume.c 2009-06-17 01:48:16.000000000 +0200 | ||
4 | @@ -97,7 +97,7 @@ | ||
5 | |||
6 | if (blkid_probe_lookup_value(pr, "TYPE", &type, NULL)) | ||
7 | type = ""; | ||
8 | - if (libhal_changeset_set_property_string (cs, "volume.fstype", type)) | ||
9 | + if (!libhal_changeset_set_property_string (cs, "volume.fstype", type)) | ||
10 | libhal_changeset_set_property_string (cs, "volume.fstype", ""); | ||
11 | HAL_DEBUG(("volume.fstype = '%s'", type)); | ||
12 | |||
13 | diff -Naur hal-0.5.12/tools/hal-storage-mount.c hal-0.5.12-magellan/tools/hal-storage-mount.c | ||
14 | --- hal-0.5.12/tools/hal-storage-mount.c 2009-05-10 21:11:44.000000000 +0200 | ||
15 | +++ hal-0.5.12-magellan/tools/hal-storage-mount.c 2009-06-17 01:49:58.000000000 +0200 | ||
16 | @@ -786,7 +786,8 @@ | ||
17 | /* don't consider uid= on vfat, iso9660, hfs and udf change-uid for the purpose of policy | ||
18 | * (since these doesn't contain uid/gid bits) | ||
19 | */ | ||
20 | - if (strcmp (libhal_volume_get_fstype (volume), "vfat") != 0 && | ||
21 | + if (libhal_volume_get_fstype (volume) != NULL && | ||
22 | + strcmp (libhal_volume_get_fstype (volume), "vfat") != 0 && | ||
23 | strcmp (libhal_volume_get_fstype (volume), "ntfs") != 0 && | ||
24 | strcmp (libhal_volume_get_fstype (volume), "ntfs-3g") != 0 && | ||
25 | strcmp (libhal_volume_get_fstype (volume), "iso9660") != 0 && |