hal/tools fstab-sync.c,1.26,1.27

[David Zeuthen]

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

Modified Files:
	fstab-sync.c 
Log Message:
2004-10-21  David Zeuthen  <davidz at redhat.com>

	* hald/linux/net_class_device.c (net_class_pre_process): Just see if
	there is a 'wireless' directory in sysfs; don't let the libsysfs copy
	try to open files cause that might fail on orinoco+hermes (RH bug
	136591). Reported by Dan Williams <dcbw at redhat.com>



Index: fstab-sync.c
===================================================================
RCS file: /cvs/hal/hal/tools/fstab-sync.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- fstab-sync.c	19 Oct 2004 00:17:50 -0000	1.26
+++ fstab-sync.c	21 Oct 2004 21:27:44 -0000	1.27
@@ -1510,6 +1510,9 @@
   boolean is_mounted = FALSE;
   struct mntent *m;
 
+  if (line->block_device == NULL || line->mount_point == NULL)
+	  goto out;
+
   f = fopen (_PATH_MOUNTED, "r");
   if (f == NULL)
     goto out;
@@ -1539,6 +1542,9 @@
   line = table->lines;
   while (line != NULL)
     {
+	    fstab_update_debug (_("%d: Seeing if line for dev='%s',mnt='%s' should be removed\n"), pid, line->block_device, line->mount_point);
+	    fstab_update_debug (_("%d: is_generated=%d, is_mounted=%d\n"), pid, 
+				fs_table_line_is_generated (line), fs_table_line_is_mounted (line));
       /* don't remove generated line if device is mounted there */
       if (fs_table_line_is_generated (line) && !fs_table_line_is_mounted (line))
         {