|
Lines 146-152
Link Here
|
| 146 |
volume.policy.should_mount does not exist |
146 |
volume.policy.should_mount does not exist |
| 147 |
AND { storage.policy.should_mount == TRUE on block.storage_device |
147 |
AND { storage.policy.should_mount == TRUE on block.storage_device |
| 148 |
OR { storage.policy.should_mount does not exist on |
148 |
OR { storage.policy.should_mount does not exist on |
| 149 |
block.storage_device AND storage.removable == TRUE on |
149 |
block.storage_device AND { storage.removable == TRUE |
|
|
150 |
OR storage.hotpluggable == TRUE |
| 151 |
} on |
| 150 |
block.storage_device |
152 |
block.storage_device |
| 151 |
} |
153 |
} |
| 152 |
} |
154 |
} |
|
Lines 216-229
Link Here
|
| 216 |
{ |
218 |
{ |
| 217 |
ivm_check_dbus_error(&dbus_error); |
219 |
ivm_check_dbus_error(&dbus_error); |
| 218 |
// OK, so no storage policy was specified anywhere. Now we'll mount |
220 |
// OK, so no storage policy was specified anywhere. Now we'll mount |
| 219 |
// if parent device is removable. |
221 |
// if parent device is removable or hotpluggable. |
| 220 |
if ( |
222 |
if ( |
| 221 |
!libhal_device_property_exists( hal_ctx, new_udi, "storage.removable", NULL ) || |
223 |
(!libhal_device_property_exists( hal_ctx, new_udi, "storage.removable", NULL ) || |
| 222 |
!libhal_device_get_property_bool( hal_ctx, new_udi, "storage.removable", NULL ) |
224 |
!libhal_device_get_property_bool( hal_ctx, new_udi, "storage.removable", NULL )) && |
|
|
225 |
(!libhal_device_property_exists( hal_ctx, new_udi, "storage.hotpluggable", NULL ) || |
| 226 |
!libhal_device_get_property_bool( hal_ctx, new_udi, "storage.hotpluggable", NULL )) |
| 223 |
) { |
227 |
) { |
| 224 |
DEBUG(_("\ |
228 |
DEBUG(_("\ |
| 225 |
Device %s won't be mounted because no mount policy was specified on \ |
229 |
Device %s won't be mounted because no mount policy was specified on \ |
| 226 |
volume or storage device and storage device does not appear to be removable"), device |
230 |
volume or storage device and storage device does not appear to be removable or hotpluggable"), device |
| 227 |
); |
231 |
); |
| 228 |
libhal_free_string( device ); |
232 |
libhal_free_string( device ); |
| 229 |
libhal_free_string( new_udi ); |
233 |
libhal_free_string( new_udi ); |
