hal/hald/linux2 blockdev.c,1.18,1.19

[David Zeuthen]

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

Modified Files:
	blockdev.c 
Log Message:
2005-07-20  David Zeuthen  <davidz at redhat.com>

        Patch from W. Michael Petullo <mike at flyn.org>.

        * configure.in: Add tools/hal-luks-setup to AC_OUTPUT

        * tools/hal-luks-setup.in: New file

        * fdi/policy/10osvendor/15-storage-luks.fdi: New file

        * hald/linux2/blockdev.c (blockdev_get_luks_uuid): Minor changes
        to give for informational debug



Index: blockdev.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/blockdev.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- blockdev.c	11 Jul 2005 17:32:05 -0000	1.18
+++ blockdev.c	20 Jul 2005 23:43:19 -0000	1.19
@@ -478,9 +478,10 @@
 			struct stat statbuf;
 			while ((f = g_dir_read_name (dir)) != NULL) {
 				char luks_prefix[] = "luks_crypto_";
-				HAL_INFO (("looking at /dev/mapper/%s", f));
 				g_snprintf (devpath, sizeof (devpath), "/dev/mapper/%s", f);
 				if (stat (devpath, &statbuf) == 0) {
+					HAL_INFO (("looking at /dev/mapper/%s with %d:%d", 
+						   f, MAJOR(statbuf.st_rdev), MINOR(statbuf.st_rdev)));
 					if (S_ISBLK (statbuf.st_mode) && 
 					    MAJOR(statbuf.st_rdev) == major && 
 					    MINOR(statbuf.st_rdev) == minor &&