- Added disabling of the automounter while MediaManager

  init and restoring of the old state on exit (#154326).

diff --git a/package/libzypp.changes b/package/libzypp.changes
index e43ed9e02d86b5f0f78e65173f3d3393dde50d6b..6dde66da47fb918b2933e4a5eedeabc0c904d0ae 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar 31 14:28:14 CEST 2006 - mt@suse.de
+
+- Added disabling of the automounter while MediaManager
+  init and restoring of the old state on exit (#154326).
+- rev 2833
+
 -------------------------------------------------------------------
 Fri Mar 31 13:27:09 CEST 2006 - mt@suse.de
 

diff --git a/zypp/media/MediaManager.cc b/zypp/media/MediaManager.cc
index 611db5c72b7258cec72a2100d38929db35a798d4..b49f858238deb5f8268d295555b738b0c350fb00 100644 (file)
--- a/zypp/media/MediaManager.cc
+++ b/zypp/media/MediaManager.cc
@@ -15,6 +15,7 @@
 #include <zypp/media/Mount.h>
 #include <zypp/thread/Mutex.h>
 #include <zypp/thread/MutexLock.h>
+#include <zypp/target/hal/HalContext.h>
 
 #include <zypp/base/String.h>
 #include <zypp/base/Logger.h>
@@ -121,6 +122,137 @@ namespace zypp
       typedef std::map<MediaAccessId, ManagedMedia> ManagedMediaMap;
 
 
+      // -------------------------------------------------------------
+      enum AutoMounterCleanUp
+      {
+        NONE, ENABLE, REMOVE
+      };
+
+      #define HAL_AUTOMOUNTER_UDI  "/org/freedesktop/Hal/devices/computer"
+      #define HAL_AUTOMOUNTER_KEY  "storage.disable_volume_handling"
+
+      // -------------------------------------------------------------
+      AutoMounterCleanUp
+      disableAutoMounter()
+      {
+        using namespace zypp::target::hal;
+
+        AutoMounterCleanUp cleanup(NONE);
+        try
+        {
+          HalContext hal(true);
+          bool disabled(false);
+
+          // query
+          XXX << "Checking HAL volume handling property"
+              << std::endl;
+          try
+          {
+            disabled = hal.getDevicePropertyBool(
+              HAL_AUTOMOUNTER_UDI, HAL_AUTOMOUNTER_KEY
+            );
+
+            if( disabled)
+            {
+              MIL << "HAL volume handling is already disabled"
+                  << std::endl;
+            }
+            else
+            {
+              cleanup = ENABLE;
+              XXX << "HAL volume handling is enabled"
+                  << std::endl;
+            }
+          }
+          catch(const HalException &e)
+          {
+            ZYPP_CAUGHT(e);
+            XXX << "HAL volume handling is enabled (no property)"
+                << std::endl;
+            disabled = false;
+            cleanup  = REMOVE;
+          }
+
+          // disable
+          if( !disabled)
+          {
+            XXX << "Trying to disable HAL volume handling"
+                << std::endl;
+            try
+            {
+              hal.setDevicePropertyBool(
+                HAL_AUTOMOUNTER_UDI, HAL_AUTOMOUNTER_KEY,
+                true
+              );
+
+              MIL << "Disabled HAL volume handling (automounter)"
+                  << std::endl;
+            }
+            catch(const HalException &e)
+            {
+              ZYPP_CAUGHT(e);
+              WAR << "Unable to disable HAL volume handling (automounter)"
+                  << std::endl;
+
+              cleanup  = NONE;
+            }
+          }
+        }
+        catch(const HalException &e)
+        {
+          ZYPP_CAUGHT(e);
+          WAR << "Unable to disable HAL volume handling (automounter)"
+              << std::endl;
+        }
+        return cleanup;
+      }
+
+      // -------------------------------------------------------------
+      void
+      restoreAutoMounter(AutoMounterCleanUp cleanup)
+      {
+        using namespace zypp::target::hal;
+
+        if(cleanup == NONE)
+          return;
+
+        try
+        {
+          HalContext hal(true);
+
+          if(cleanup == ENABLE)
+          {
+            XXX << "Trying to restore HAL volume handling -- enable"
+                << std::endl;
+
+            hal.setDevicePropertyBool(
+              HAL_AUTOMOUNTER_UDI, HAL_AUTOMOUNTER_KEY,
+              false
+            );
+          }
+          else
+          if(cleanup == REMOVE)
+          {
+            XXX << "Trying to restore HAL volume handling -- remove"
+                << std::endl;
+
+            hal.removeDeviceProperty(
+              HAL_AUTOMOUNTER_UDI, HAL_AUTOMOUNTER_KEY
+            );
+          }
+
+          cleanup = NONE;
+          MIL << "Restored HAL volume handling (automounter)"
+              << std::endl;
+        }
+        catch(const HalException &e)
+        {
+          ZYPP_CAUGHT(e);
+          WAR << "Unable to restore HAL volume handling (automounter)"
+              << std::endl;
+        }
+      }
+
       ////////////////////////////////////////////////////////////////
     } // anonymous
     //////////////////////////////////////////////////////////////////
@@ -132,12 +264,16 @@ namespace zypp
     private:
       friend class MediaManager;
 
-      MediaAccessId   last_accessid;
-      ManagedMediaMap mediaMap;
+      MediaAccessId       last_accessid;
+      AutoMounterCleanUp  am_cleanup;
+      ManagedMediaMap     mediaMap;
 
       MediaManager_Impl()
         : last_accessid(0)
-      {}
+      {
+        // disable automounter
+        am_cleanup = disableAutoMounter();
+      }
 
     public:
       ~MediaManager_Impl()
@@ -169,6 +305,9 @@ namespace zypp
 
           // remove all other handlers
           mediaMap.clear();
+
+          // restore automounter state
+          restoreAutoMounter(am_cleanup);
         }
         catch( ... )
         {}