diff options
Diffstat (limited to 'packages/ivman')
| -rw-r--r-- | packages/ivman/files/ivman-0.6-hotpluggable.patch | 40 | ||||
| -rw-r--r-- | packages/ivman/files/ivman-launch.patch | 15 | ||||
| -rw-r--r-- | packages/ivman/ivman_0.6.14.bb | 2 |
3 files changed, 1 insertions, 56 deletions
diff --git a/packages/ivman/files/ivman-0.6-hotpluggable.patch b/packages/ivman/files/ivman-0.6-hotpluggable.patch index 1be1953074..8f734bd0d2 100644 --- a/packages/ivman/files/ivman-0.6-hotpluggable.patch +++ b/packages/ivman/files/ivman-0.6-hotpluggable.patch @@ -38,43 +38,3 @@ http://lists.freedesktop.org/archives/hal/2005-October/003441.html ); libhal_free_string( device ); libhal_free_string( new_udi ); -http://bugs.gentoo.org/show_bug.cgi?id=169593 - iulica@box.co.uk -This patch tests also for a storage if it is hotpluggable and mounts it -automatically. A reason of creating the patch can be found here: -http://lists.freedesktop.org/archives/hal/2005-October/003441.html - ---- a/src/IvmConfig/IvmConfigCommon.c.old 2007-03-05 15:28:49.000000000 +0100 -+++ b/src/IvmConfig/IvmConfigCommon.c 2007-03-05 15:34:36.000000000 +0100 -@@ -146,7 +146,9 @@ - volume.policy.should_mount does not exist - 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 AND { storage.removable == TRUE -+ OR storage.hotpluggable == TRUE -+ } on - block.storage_device - } - } -@@ -216,14 +218,16 @@ - { - ivm_check_dbus_error(&dbus_error); - // OK, so no storage policy was specified anywhere. Now we'll mount -- // if parent device is removable. -+ // if parent device is removable or hotpluggable. - if ( -- !libhal_device_property_exists( hal_ctx, new_udi, "storage.removable", NULL ) || -- !libhal_device_get_property_bool( hal_ctx, new_udi, "storage.removable", NULL ) -+ (!libhal_device_property_exists( hal_ctx, new_udi, "storage.removable", NULL ) || -+ !libhal_device_get_property_bool( hal_ctx, new_udi, "storage.removable", NULL )) && -+ (!libhal_device_property_exists( hal_ctx, new_udi, "storage.hotpluggable", NULL ) || -+ !libhal_device_get_property_bool( hal_ctx, new_udi, "storage.hotpluggable", NULL )) - ) { - DEBUG(_("\ - Device %s won't be mounted because no mount policy was specified on \ --volume or storage device and storage device does not appear to be removable"), device -+volume or storage device and storage device does not appear to be removable or hotpluggable"), device - ); - libhal_free_string( device ); - libhal_free_string( new_udi ); diff --git a/packages/ivman/files/ivman-launch.patch b/packages/ivman/files/ivman-launch.patch index 7c3176ae2c..8595a4d806 100644 --- a/packages/ivman/files/ivman-launch.patch +++ b/packages/ivman/files/ivman-launch.patch @@ -13,18 +13,3 @@ while [ ! -z "$1" ];do case "$1" in --help|-h) ---- ivman-0.6.14/ivman-launch.orig 2008-09-29 11:58:49.000000000 +0300 -+++ ivman-0.6.14/ivman-launch 2008-09-29 12:02:17.000000000 +0300 -@@ -1,11 +1,10 @@ --#!/bin/bash -+#!/bin/sh - # This script was written by Daniele Favara <danjele@gmail.com> - # - CMD=ivman - CONFDIR= # the config dir | null - EXITWITH= - SESSION= --set -x - while [ ! -z "$1" ];do - case "$1" in - --help|-h) diff --git a/packages/ivman/ivman_0.6.14.bb b/packages/ivman/ivman_0.6.14.bb index 5c0f1cc906..ecc4665b9b 100644 --- a/packages/ivman/ivman_0.6.14.bb +++ b/packages/ivman/ivman_0.6.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Daemon to mount/unmount devices, based on info from HAL" HOMEPAGE = "http://ivman.sf.net" LICENSE = "GPLv2" -PR = "r0" +PR = "r1" DEPENDS = "hal libxml2" RDEPENDS = "hal pmount-hal" |