File ivman-0.6.14-halmount.patch of Package ivman

Index: ivman-0.6.14/src/manager.c
===================================================================
--- ivman-0.6.14.orig/src/manager.c	2007-01-29 12:52:31.000000000 +0100
+++ ivman-0.6.14/src/manager.c	2008-10-28 17:18:30.000000000 +0100
@@ -260,29 +260,23 @@ void set_mount_command()
 
     // OK, now try to find a mount program.
     // mount programs in order of preference:
-    // - pmount-hal (for user-mode Ivman only)
+    // - halmount (for user-mode Ivman only)
     // - pmount
     // - mount
 
-    // Test if pmount-hal exists
+    // Test if halmount exists
     if ( usermode ) {
-        if ( !command_exists( "pmount-hal > /dev/null 2>&1" ) ) {
-            DEBUG(_("pmount-hal was not found on your system.\n"));
+        if ( !command_exists( "halmount > /dev/null 2>&1" ) ) {
+            DEBUG(_("halmount was not found on your system.\n"));
         }
         else {
-            if ( !command_exists( "pumount > /dev/null 2>&1" ) ) {
-                DEBUG(_("pmount-hal was found on your system, but pumount "
-                        "wasn't!\n"));
-            }
-            else {
-                DEBUG(_
-                      ("pmount-hal was found on your system. It will be "
-                       "used for mounting.\n"));
-                known_mount_command = "pmount-hal '$hal.info.udi$'";
-                unknown_mount_command = known_mount_command;
-                umount_command = "pumount '$hal.block.device$'";
-                return;
-            }
+            DEBUG(_
+                  ("halmount was found on your system. It will be "
+                   "used for mounting.\n"));
+            known_mount_command = "halmount '$hal.block.device$'";
+            unknown_mount_command = known_mount_command;
+            umount_command = "halmount -u '$hal.block.device$'";
+            return;
         }
         // Test if gnome-mount exists
         if ( !command_exists( "gnome-mount > /dev/null 2>&1" ) ) {
@@ -300,8 +294,8 @@ void set_mount_command()
     }
     else {
         DEBUG(_
-              ("pmount-hal/gnome-mount detection skipped, as we are a root instance "
-               "of Ivman.  pmount-hal/gnome-mount is only used for user instances.\n"));
+              ("halmount/gnome-mount detection skipped, as we are a root instance "
+               "of Ivman.  halmount/gnome-mount is only used for user instances.\n"));
     }