hal: Branch 'master'

[Artem Kachitchkine]

Sorry about that, folks. I actually did discover these and generated a 
new patch, but unfortunately committed the old buggy patch.

-Artem.

>     fixed build of HAL
>     
>     Replaced in blockdev.c is_mounted_by_hald() with hal_util_is_mounted_by_hald
>     and included <sys/file.h> in utils.c for flock().
>     
>     NOTE: Please run make or make dist before commit.
> 
> diff --git a/hald/linux2/blockdev.c b/hald/linux2/blockdev.c
> index f01787d..5cbf025 100644
> --- a/hald/linux2/blockdev.c
> +++ b/hald/linux2/blockdev.c
> @@ -1206,7 +1206,7 @@ force_unmount (HalDevice *d, void *end_t
>  	mount_point = hal_device_property_get_string (d, "volume.mount_point");
>  
>  	/* look up in /media/.hal-mtab to see if we mounted this one */
> -	if (mount_point != NULL && strlen (mount_point) > 0 && is_mounted_by_hald (mount_point)) {
> +	if (mount_point != NULL && strlen (mount_point) > 0 && hal_util_is_mounted_by_hald (mount_point)) {
>  		char *unmount_stdin;
>  		char *extra_env[2];
>  
> diff --git a/hald/util.c b/hald/util.c
> index 9a3fca0..8f3233b 100644
> --- a/hald/util.c
> +++ b/hald/util.c
> @@ -39,6 +39,7 @@
>  #include <fcntl.h>
>  #include <signal.h>
>  #include <sys/wait.h>
> +#include <sys/file.h>
>  
>  #include <glib.h>
>  #include <dbus/dbus.h>
> _______________________________________________
> hal-commit mailing list
> hal-commit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/hal-commit