ivman/hotpluggable.patch

   1 --- src/ivman-0.6.14/src/IvmConfig/IvmConfigCommon.c.old        2007-03-05 15:28:49.000000000 +0100
   2 +++ src/ivman-0.6.14/src/IvmConfig/IvmConfigCommon.c    2007-03-05 15:34:36.000000000 +0100
   3 @@ -146,7 +146,9 @@
   4                 volume.policy.should_mount does not exist
   5                 AND { storage.policy.should_mount == TRUE on block.storage_device
   6                       OR { storage.policy.should_mount does not exist on
   7 -                          block.storage_device AND storage.removable == TRUE on
   8 +                          block.storage_device AND { storage.removable == TRUE
   9 +                                                     OR storage.hotpluggable == TRUE
  10 +                                                   } on
  11                            block.storage_device
  12                          }
  13                     }
  14 @@ -216,14 +218,16 @@
  15          {
  16             ivm_check_dbus_error(&dbus_error);
  17              // OK, so no storage policy was specified anywhere.  Now we'll mount
  18 -            // if parent device is removable.
  19 +            // if parent device is removable or hotpluggable.
  20              if (
  21 -              !libhal_device_property_exists( hal_ctx, new_udi, "storage.removable", NULL ) ||
  22 -              !libhal_device_get_property_bool( hal_ctx, new_udi, "storage.removable", NULL )
  23 +              (!libhal_device_property_exists( hal_ctx, new_udi, "storage.removable", NULL ) ||
  24 +              !libhal_device_get_property_bool( hal_ctx, new_udi, "storage.removable", NULL )) &&
  25 +              (!libhal_device_property_exists( hal_ctx, new_udi, "storage.hotpluggable", NULL ) ||
  26 +              !libhal_device_get_property_bool( hal_ctx, new_udi, "storage.hotpluggable", NULL ))
  27              ) {
  28                  DEBUG(_("\
  29  Device %s won't be mounted because no mount policy was specified on \
  30 -volume or storage device and storage device does not appear to be removable"), device
  31 +volume or storage device and storage device does not appear to be removable or hotpluggable"), device
  32                  );
  33                  libhal_free_string( device );
  34                  libhal_free_string( new_udi );