hal/tools fstab-sync.c,1.31,1.32

[David Zeuthen]

Update of /cvs/hal/hal/tools
In directory gabe:/tmp/cvs-serv16495/tools

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

	Fix up more sloppy errors incuded from patches that I should
	have reviewed more carefully :-/

	* libhal-storage/libhal-storage.c: Match against
	LIBHAL_PROPERTY_TYPE_*, not DBUS_TYPE_*
	(libhal_drive_policy_default_use_managed_keyword):
	(libhal_drive_policy_default_get_mount_root):
	(libhal_drive_policy_default_use_managed_keyword):
	(libhal_drive_policy_default_get_managed_keyword_primary):
	(libhal_drive_policy_default_get_managed_keyword_secondary):
	(libhal_drive_policy_get_mount_options):
	(libhal_volume_policy_get_mount_options): Yikes, Yikes, rename
	"/org/freedesktop/LibHal" back to "/org/freedesktop/Hal"

	* libhal/libhal.c (libhal_property_fill_value_from_variant): p->type
	wasn't being assigned :-/. Also, DBUS_TYPE_BOOLEAN wasn't handled.

	* hald/hald_test_libhal.c (check_libhal): Fix this test



Index: fstab-sync.c
===================================================================
RCS file: /cvs/hal/hal/tools/fstab-sync.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- fstab-sync.c	16 Feb 2005 18:45:19 -0000	1.31
+++ fstab-sync.c	16 Feb 2005 21:25:35 -0000	1.32
@@ -1158,7 +1158,6 @@
 	fstab_update_debug (_("%d: entering add_hal_device, udi='%s'\n"), pid, udi);
 	
 	drive  = libhal_drive_from_udi (hal_context, udi);
-	/*fstab_update_debug (_("%d: drive=%x, volume=%x\n"), pid, drive, volume);*/
 	if (drive == NULL) {
 		char *udi_storage_device;
 		DBusError error;
@@ -1174,6 +1173,8 @@
 	}
 
 	volume = libhal_volume_from_udi (hal_context, udi);
+
+	/*fstab_update_debug (_("%d: drive=%x, volume=%x\n"), pid, drive, volume);*/
 		
 	/* see if we are a drive */
 	if (volume == NULL) {
@@ -1191,6 +1192,8 @@
 		if (device_file == NULL)
 			goto out;
 
+		fstab_update_debug (_("%d: device_file=%s\n"), pid, device_file);
+
 		if (fs_table_has_device (table, device_file, NULL, udi)) /* no label */ {
 			fstab_update_debug (_("%d: Could not add entry to fstab file: "
 					      "block device %s already listed\n"), pid, device_file);