hal/hald/linux block_class_device.c,1.57,1.58 osspec.c,1.32,1.33

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux
In directory gabe:/tmp/cvs-serv18854/hald/linux

Modified Files:
	block_class_device.c osspec.c 
Log Message:
2004-08-23  David Zeuthen  <david at fubar.dk>

	* hald/linux/block_class_device.c (force_unmount): Don't clear the 
	volume.* properties

	* hald/linux/osspec.c (rem_device): Call the removed method on the
	ClassDeviceHandler

	* tools/fstab-sync.c:
	(fs_table_add_volume): Only use fstype auto for optical and floppy
	drives; ignore the rest if fstype cannot be probled (fixes *some*
	issues with RAID partitions getting added to fstab)
	(volume_determine_mount_point): Complete rewrite; this was broken
	for ieee1394 drives. Also check if the directory is available
	in /media or whatever the root is
	(fs_table_remove_generated_entries): Also remove directory in
	/media. Fixed a bug where only every other line was removed.



Index: block_class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/block_class_device.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- block_class_device.c	22 Aug 2004 19:27:22 -0000	1.57
+++ block_class_device.c	23 Aug 2004 14:40:54 -0000	1.58
@@ -392,6 +392,7 @@
 			 * us off the bus, in fact it's doing exiting with code 1
 			 * for us - not nice
 			 */
+/*
 			device_property_atomic_update_begin ();
 			hal_device_property_set_string (d, "volume.mount_point",
 						"");
@@ -399,6 +400,7 @@
 			hal_device_property_set_bool (d, "volume.is_mounted",
 					      FALSE);
 			device_property_atomic_update_end ();
+*/
 		}
 	}
 }

Index: osspec.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/osspec.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- osspec.c	22 Aug 2004 19:27:22 -0000	1.32
+++ osspec.c	23 Aug 2004 14:40:54 -0000	1.33
@@ -870,6 +870,7 @@
 static HalDevice *
 rem_device (const char *sysfs_path, const char *subsystem)
 {
+	int i;
 	int len1;
 	int len2;
 	char buf1[SYSFS_PATH_MAX];
@@ -895,6 +896,15 @@
 			goto out;
 		} else {
 
+			for (i=0; class_device_handlers[i] != NULL; i++) {
+				ClassDeviceHandler *ch = class_device_handlers[i];
+				/** @todo TODO FIXME: just use ->accept() once we get rid of libsysfs */
+				if (strcmp (ch->hal_class_name, subsystem) == 0) {
+					ch->removed (ch, sysfs_path, hal_device);
+				}
+
+			}
+
 			g_signal_connect (hal_device, "callouts_finished",
 					  G_CALLBACK (rem_device_callouts_finished), NULL);
 			HAL_INFO (("in remove_device for udi=%s", hal_device->udi));