hal/hald/linux2/probing probe-volume.c,1.2,1.3

[David Zeuthen]

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

Modified Files:
	probe-volume.c 
Log Message:
2005-02-16  David Zeuthen  <davidz at redhat.com>

	Patch from W. Michael Petullo <mike at flyn.org>. Attached you should
	find a patch that begins to add LUKS support to hald. This should
	eventually provide an easy means to mount encrypted filesystems.
	Currently, hald only detects that a disk contains a LUKS header
	and sets some relevant parameters.

	* volume_id/volume_id.h: Add VOLUME_ID_CRYPTO to volume_id_usage enum

	* volume_id/util.c (usage_to_string): Add LUKS string

	* volume_id/volume_id.c (volume_id_probe_all): Also test for LUKS magic

	* volume_id/Makefile.am (libvolume_id_la_SOURCES): Include luks.[ch]

	* hald/linux2/probing/probe-volume.c (set_volume_id_values): Supprt
	the VOLUME_ID_CRYPTO type



Index: probe-volume.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-volume.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- probe-volume.c	11 Feb 2005 22:01:08 -0000	1.2
+++ probe-volume.c	16 Feb 2005 20:16:55 -0000	1.3
@@ -74,6 +74,9 @@
 	case VOLUME_ID_RAID:
 		usage = "raid";
 		break;
+	case VOLUME_ID_CRYPTO:
+		usage = "crypto";
+		break;
 	case VOLUME_ID_UNUSED:
 		libhal_device_set_property_string (ctx, udi, "info.product", "Volume (unused)", &error);
 		usage = "unused";