hal/volume_id Makefile.am, 1.1, 1.2 util.c, 1.1, 1.2 volume_id.c, 1.1, 1.2 volume_id.h, 1.1, 1.2

[David Zeuthen]

Update of /cvs/hal/hal/volume_id
In directory gabe:/tmp/cvs-serv3962/volume_id

Modified Files:
	Makefile.am util.c volume_id.c volume_id.h 
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: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/volume_id/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	7 Feb 2005 21:24:16 -0000	1.1
+++ Makefile.am	16 Feb 2005 20:16:55 -0000	1.2
@@ -12,6 +12,7 @@
 	linux_raid.h		linux_raid.c		\
 	linux_swap.h		linux_swap.c		\
 	lvm.h			lvm.c			\
+	luks.h			luks.c			\
 	mac.h			mac.c			\
 	msdos.h			msdos.c			\
 	ntfs.h			ntfs.c			\

Index: util.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/util.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- util.c	7 Feb 2005 21:24:16 -0000	1.1
+++ util.c	16 Feb 2005 20:16:55 -0000	1.2
@@ -53,6 +53,8 @@
 		return "raid";
 	case VOLUME_ID_DISKLABEL:
 		return "disklabel";
+	case VOLUME_ID_CRYPTO:
+		return "crypto";
 	case VOLUME_ID_UNPROBED:
 		return "unprobed";
 	case VOLUME_ID_UNUSED:

Index: volume_id.c
===================================================================
RCS file: /cvs/hal/hal/volume_id/volume_id.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- volume_id.c	7 Feb 2005 21:24:16 -0000	1.1
+++ volume_id.c	16 Feb 2005 20:16:55 -0000	1.2
@@ -76,6 +76,10 @@
 	if (volume_id_probe_highpoint_ataraid(id, off) == 0)
 		goto exit;
 
+	/* LUKS encrypted volume */
+	if (volume_id_probe_luks(id, off) == 0)
+		goto exit;
+
 	/* signature in the first block, only small buffer needed */
 	if (volume_id_probe_vfat(id, off) == 0)
 		goto exit;

Index: volume_id.h
===================================================================
RCS file: /cvs/hal/hal/volume_id/volume_id.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- volume_id.h	7 Feb 2005 21:24:16 -0000	1.1
+++ volume_id.h	16 Feb 2005 20:16:55 -0000	1.2
@@ -38,6 +38,7 @@
 	VOLUME_ID_PARTITIONTABLE,
 	VOLUME_ID_RAID,
 	VOLUME_ID_DISKLABEL,
+	VOLUME_ID_CRYPTO,
 };
 
 struct volume_id_partition {