hal ChangeLog,1.258,1.259 configure.in,1.34,1.35

[David Zeuthen]

Update of /cvs/hal/hal
In directory gabe:/tmp/cvs-serv31962

Modified Files:
	ChangeLog configure.in 
Log Message:
2004-08-25  David Zeuthen  <david at fubar.dk>

	* configure.in: Add option for new callout hal-hotplug-map
	
	* hald/device.[ch]: Add the "cancelled" signal and hal_device_cancel
	method

	* hald/hald.c (main): Avoid daemonization for now; will make hald
	hang if anything fails up-until device probing (RH bug 130849)

	* hald/linux/class_device.c (class_device_got_device_file):
	Cancel the device if don't get the device file

	* hald/linux/common.h: Increase timeout to 60 secs. Make note
	about we really need the SEQNUM support in udev

	* hald/linux/osspec.c: 
	(process_coldplug_list_device_cancelled): New function
	(process_coldplug_list): Add support for cancelling
	(reenable_hotplug_proc_on_device_cancel): New function
	(hald_helper_hotplug): Add support for cancelling
	(hotplug_sem_up): Add some helpful debug
	(hotplug_sem_down): Add some helpful debug
	(hald_helper_data): Add some helpful debug

	* tools/Makefile.am: Also remove callout on uninstall

	* tools/fstab-sync.c:
	(fs_table_remove_volume): Only require device_file not complete Volume
	object
	(remove_udi): Don't require storage device to be present (fixes some
	problems when unplugging unpartitioned media as we don't get hotplug
	event and things are thus not serialised)

	* tools/linux/Makefile.am: Build and, optionally, install 
	hal-hotplug-map callout

	* tools/linux/hal_hotplug_map.c: New program; a tad Red Hat specific
	wrt. file locations; patches are welcome. The single purpose of
	this callout is to detect gphoto2 supported cameras and libsane
	supported scanners using usermap files in /etc/hotplug.



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -d -r1.258 -r1.259
--- ChangeLog	25 Aug 2004 20:20:22 -0000	1.258
+++ ChangeLog	25 Aug 2004 20:55:12 -0000	1.259
@@ -1,3 +1,45 @@
+2004-08-25  David Zeuthen  <david at fubar.dk>
+
+	* configure.in: Add option for new callout hal-hotplug-map
+	
+	* hald/device.[ch]: Add the "cancelled" signal and hal_device_cancel
+	method
+
+	* hald/hald.c (main): Avoid daemonization for now; will make hald
+	hang if anything fails up-until device probing (RH bug 130849)
+
+	* hald/linux/class_device.c (class_device_got_device_file):
+	Cancel the device if don't get the device file
+
+	* hald/linux/common.h: Increase timeout to 60 secs. Make note
+	about we really need the SEQNUM support in udev
+
+	* hald/linux/osspec.c: 
+	(process_coldplug_list_device_cancelled): New function
+	(process_coldplug_list): Add support for cancelling
+	(reenable_hotplug_proc_on_device_cancel): New function
+	(hald_helper_hotplug): Add support for cancelling
+	(hotplug_sem_up): Add some helpful debug
+	(hotplug_sem_down): Add some helpful debug
+	(hald_helper_data): Add some helpful debug
+
+	* tools/Makefile.am: Also remove callout on uninstall
+
+	* tools/fstab-sync.c:
+	(fs_table_remove_volume): Only require device_file not complete Volume
+	object
+	(remove_udi): Don't require storage device to be present (fixes some
+	problems when unplugging unpartitioned media as we don't get hotplug
+	event and things are thus not serialised)
+
+	* tools/linux/Makefile.am: Build and, optionally, install 
+	hal-hotplug-map callout
+
+	* tools/linux/hal_hotplug_map.c: New program; a tad Red Hat specific
+	wrt. file locations; patches are welcome. The single purpose of
+	this callout is to detect gphoto2 supported cameras and libsane
+	supported scanners using usermap files in /etc/hotplug.
+
 2004-08-25  Kay Sievers  <kay.sievers at vrfy.org>
 
 	* hald/linux/block_class_device.c:

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- configure.in	23 Aug 2004 18:44:23 -0000	1.34
+++ configure.in	25 Aug 2004 20:55:12 -0000	1.35
@@ -63,13 +63,22 @@
     AC_DEFINE(ENABLE_VERBOSE_MODE,1,[Support a verbose mode])
 fi
 
-AC_ARG_ENABLE(fstab-sync,         [  --enable-fstab-sync     Build and install fstab-sync],enable_fstab_sync=yes,enable_fstab_sync=no)
+AC_ARG_ENABLE(fstab-sync,         [  --enable-fstab-sync     Install fstab-sync callout],enable_fstab_sync=yes,enable_fstab_sync=no)
 if test "x$enable_fstab_sync" = "xyes" ; then
-   AC_DEFINE(FSTAB_SYNC_ENABLED,1,[Whether fstab-sync should be built and installed])
+   AC_DEFINE(FSTAB_SYNC_ENABLED,1,[Whether fstab-sync callout should be installed])
 fi
 AC_SUBST(FSTAB_SYNC_ENABLED)
 AM_CONDITIONAL(FSTAB_SYNC_ENABLED, test x$enable_fstab_sync = xyes)
 
+
+AC_ARG_ENABLE(hotplug_map,         [  --enable-hotplug-map   Install hotplug-map callout],enable_hotplug_map=yes,enable_hotplug_map=no)
+if test "x$enable_hotplug_map" = "xyes" ; then
+   AC_DEFINE(HOTPLUG_MAP_ENABLED,1,[Whether hotplug-map callout should be installed])
+fi
+AC_SUBST(HOTPLUG_MAP_ENABLED)
+AM_CONDITIONAL(HOTPLUG_MAP_ENABLED, test x$enable_hotplug_map = xyes)
+
+
 AC_ARG_ENABLE(mnt-noop,         [  --enable-mnt-noop       Use noop option in fstab-sync],enable_mnt_noop=yes,enable_mnt_noop=no)
 if test "x$enable_mnt_noop" = "xyes" ; then
    AC_DEFINE(FSTAB_SYNC_USE_NOOP_MOUNT_OPTION,1,[Use an unique keyword in the fstab])
@@ -379,11 +388,12 @@
         Group for HAL:            ${HAL_GROUP}
         hald pidfile:             ${HALD_PID_FILE}
 
-
         install fstab-sync:       ${enable_fstab_sync}
         fstab-sync using noop:    ${enable_mnt_noop}
         fstab-sync noop keyword:  ${FSTAB_SYNC_MOUNT_MANAGED_KEYWORD}
-        fstab-sync mount root:    ${FSTAB_SYNC_MOUNT_ROOT}"
+        fstab-sync mount root:    ${FSTAB_SYNC_MOUNT_ROOT}
+
+        install hal-hotplug-map:  ${enable_hotplug_map}"
 
 echo "
         Maintainer mode:          ${USE_MAINTAINER_MODE}