hal/hald/linux block_class_device.c,1.27,1.28

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux
In directory pdx:/tmp/cvs-serv2593/hald/linux

Modified Files:
	block_class_device.c 
Log Message:
2004-06-01  David Zeuthen  <david at fubar.dk>

	* hald/hald.conf: New file, policy for hal daemon

	* hald/Makefile.am: Install hald.conf into $sysconfdir/hal

	* hald/hald_conf.c (hald_read_conf_file): New function
	(cdata): New function
	(end): New function
	(start): New function
	(parsing_abort): New function

	* hald/hald.c (main): Call hald_read_conf_file to read the 
	configuration file

	* hald/hald_conf.h (hald_read_conf_file): Added hald_read_conf_file
	prototype

	* hald/linux/block_class_device.c (block_class_pre_process): add
	storage.cdrom capability if device is a cdrom



Index: block_class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/block_class_device.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- a/block_class_device.c	1 Jun 2004 18:47:23 -0000	1.27
+++ b/block_class_device.c	1 Jun 2004 21:10:02 -0000	1.28
@@ -1158,6 +1158,7 @@
 	    strcmp (hal_device_property_get_string (stordev, "storage.drive_type"), 
 		    "cdrom") == 0) {
 		cdrom_check (stordev, device_file);
+		hal_device_add_capability (stordev, "storage.cdrom");
 	}
 
 	hal_device_property_set_string (stordev, "info.category", "storage");