[patch] A better patch for Ivman with HAL 0.5.7

ivman-hal-0.5.7.patch (text/plain), 1.91 KB, created by Rohan McGovern on 2006-04-17 20:32:52 UTC

Index: src/IvmConfig/IvmConfigCommon.c
===================================================================
--- src/IvmConfig/IvmConfigCommon.c	10 Feb 2006 01:20:51 -0000	1.11
+++ src/IvmConfig/IvmConfigCommon.c	18 Apr 2006 03:14:14 -0000
@@ -137,7 +137,12 @@
        3) volume.policy.should_mount == TRUE
           OR {
                volume.policy.should_mount does not exist
-               AND storage.policy.should_mount == TRUE on block.storage_device
+               AND { storage.policy.should_mount == TRUE on block.storage_device
+                     OR { storage.policy.should_mount does not exist on
+                          block.storage_device AND storage.removable == TRUE on
+                          block.storage_device
+                        }
+                   }
           }
      */
 
@@ -197,12 +202,20 @@
         if (!libhal_device_property_exists
             (hal_ctx, new_udi, "storage.policy.should_mount", &dbus_error))
         {
-            DEBUG(_("\
+            // OK, so no storage policy was specified anywhere.  Now we'll mount
+            // if parent device is removable.
+            if (
+              !libhal_device_property_exists( hal_ctx, new_udi, "storage.removable", &dbus_error ) ||
+              !libhal_device_get_property_bool( hal_ctx, new_udi, "storage.removable", &dbus_error )
+            ) {
+                DEBUG(_("\
 Device %s won't be mounted because no mount policy was specified on \
-either the volume or parent device"), device);
-            libhal_free_string(device);
-            libhal_free_string(new_udi);
-            return FALSE;
+volume or storage device and storage device does not appear to be removable"), device
+                );
+                libhal_free_string( device );
+                libhal_free_string( new_udi );
+                return FALSE;
+            }
         }
         else if (
                  !libhal_device_get_property_bool(hal_ctx,