|
Lines 137-143
Link Here
|
| 137 |
3) volume.policy.should_mount == TRUE |
137 |
3) volume.policy.should_mount == TRUE |
| 138 |
OR { |
138 |
OR { |
| 139 |
volume.policy.should_mount does not exist |
139 |
volume.policy.should_mount does not exist |
| 140 |
AND storage.policy.should_mount == TRUE on block.storage_device |
140 |
AND { storage.policy.should_mount == TRUE on block.storage_device |
|
|
141 |
OR { storage.policy.should_mount does not exist on |
| 142 |
block.storage_device AND storage.removable == TRUE on |
| 143 |
block.storage_device |
| 144 |
} |
| 145 |
} |
| 141 |
} |
146 |
} |
| 142 |
*/ |
147 |
*/ |
| 143 |
|
148 |
|
|
Lines 197-208
Link Here
|
| 197 |
if (!libhal_device_property_exists |
202 |
if (!libhal_device_property_exists |
| 198 |
(hal_ctx, new_udi, "storage.policy.should_mount", &dbus_error)) |
203 |
(hal_ctx, new_udi, "storage.policy.should_mount", &dbus_error)) |
| 199 |
{ |
204 |
{ |
| 200 |
DEBUG(_("\ |
205 |
// OK, so no storage policy was specified anywhere. Now we'll mount |
|
|
206 |
// if parent device is removable. |
| 207 |
if ( |
| 208 |
!libhal_device_property_exists( hal_ctx, new_udi, "storage.removable", &dbus_error ) || |
| 209 |
!libhal_device_get_property_bool( hal_ctx, new_udi, "storage.removable", &dbus_error ) |
| 210 |
) { |
| 211 |
DEBUG(_("\ |
| 201 |
Device %s won't be mounted because no mount policy was specified on \ |
212 |
Device %s won't be mounted because no mount policy was specified on \ |
| 202 |
either the volume or parent device"), device); |
213 |
volume or storage device and storage device does not appear to be removable"), device |
| 203 |
libhal_free_string(device); |
214 |
); |
| 204 |
libhal_free_string(new_udi); |
215 |
libhal_free_string( device ); |
| 205 |
return FALSE; |
216 |
libhal_free_string( new_udi ); |
|
|
217 |
return FALSE; |
| 218 |
} |
| 206 |
} |
219 |
} |
| 207 |
else if ( |
220 |
else if ( |
| 208 |
!libhal_device_get_property_bool(hal_ctx, |
221 |
!libhal_device_get_property_bool(hal_ctx, |
