hal/hald/linux2 blockdev.c,1.31,1.32

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux2
In directory gabe:/tmp/cvs-serv14173/hald/linux2

Modified Files:
	blockdev.c 
Log Message:
2006-01-21  David Zeuthen  <davidz at redhat.com>

        * hald-runner/runner.c (find_program): Simply use glib convience
        g_find_program_in_path() on the basename of the desired helper since
        our allowed paths are now in $PATH

        * hald-runner/main.c (main): Print out allowed paths

        * hald/linux2/blockdev.c (add_blockdev_probing_helper_done): Fix up
        indenting

        * hald/hald_runner.h: Modify prototype of hald_runner_start_runner to
        not take the path to the runner

        * hald/hald_runner.c (hald_runner_start_runner): Use the flag
        G_SPAWN_SEARCH_PATH to search for hald-runner. Export HALD_RUNNER_PATH
        as PATH for the runner. Always include standard locations, e.g.
        $(libexecdir) and $(datadir)/hal/scripts.

        * hald/hald_dbus.c (hald_exec_method_cb): Check if there really
        was an error

        * hald/hald.c (usage): Remove usage for --with-runner
        (main): Remove --with-runner option; just search $PATH for it

        * hald/run-hald.sh, hald/debug-hald.sh, hald/valgrind-hald.sh:
        Set $HALD_RUNNER_PATH and modify $PATH to include local hald-runner

        * tools/hal-system-storage-mount: Read and enforce security policy
        as specified in fdi/policy/10osvendor/10-security-policy.fdi

        * fdi/policy/10osvendor/Makefile.am (dist_fdi_DATA):
        Add 10-security-policy.fdi

        * fdi/policy/10osvendor/10-security-policy.fdi: New file



Index: blockdev.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/blockdev.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- blockdev.c	21 Jan 2006 02:45:27 -0000	1.31
+++ blockdev.c	21 Jan 2006 16:54:04 -0000	1.32
@@ -294,7 +294,7 @@
 	 * (return code 2 means fs found on main block device (for non-volumes)) 
 	 */
 	if (exit_type != HALD_RUN_SUCCESS
-      || !(return_code == 0 || (!is_volume && return_code == 2))) {
+	    || !(return_code == 0 || (!is_volume && return_code == 2))) {
 		hal_device_store_remove (hald_get_tdl (), d);
 		g_object_unref (d);
 		hotplug_event_end (end_token);