Attachment 282201 Details for Bug 384201 – Don't put mount points in fstab on the desktop

[patch] Don't put mount points in fstab on the desktop

gnome-vfs-2.20.1-ignore-mounts-from-fstab.patch (text/plain), 2.24 KB, created by Ron Yorston on 2007-12-09 10:28:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ron Yorston

Created: 2007-12-09 10:28:10 UTC

Size: 2.24 KB

patch

obsolete

>diff -up gnome-vfs-2.20.1/libgnomevfs/gnome-vfs-hal-mounts.c.ignore-mounts-from-fstab gnome-vfs-2.20.1/libgnomevfs/gnome-vfs-hal-mounts.c
>--- gnome-vfs-2.20.1/libgnomevfs/gnome-vfs-hal-mounts.c.ignore-mounts-from-fstab	2007-11-12 08:36:48.000000000 +0000
>+++ gnome-vfs-2.20.1/libgnomevfs/gnome-vfs-hal-mounts.c	2007-12-08 15:44:26.000000000 +0000
>@@ -50,6 +50,7 @@
> 
> 
> #include "gnome-vfs-hal-mounts.h"
>+#include "gnome-vfs-unix-mounts.h"
> #include "gnome-vfs-volume-monitor-daemon.h"
> #include "gnome-vfs-volume-monitor-private.h"
> 
>@@ -625,28 +626,6 @@ _hal_volume_policy_check (GnomeVFSVolume
> 	const char *fstype;
> #endif
> 	gboolean ret;
>-	const char *fhs23_toplevel_mount_points[] = {
>-		"/",
>-		"/bin",
>-		"/boot",
>-		"/dev",
>-		"/etc",
>-		"/home",
>-		"/lib",
>-		"/lib64",
>-		"/media",
>-		"/mnt",
>-		"/opt",
>-		"/root",
>-		"/sbin",
>-		"/srv",
>-		"/tmp",
>-		"/usr",
>-		"/var",
>-		"/proc",
>-		"/sbin",
>-		NULL
>-	};
> 
> 	ret = FALSE;
> 
>@@ -679,23 +658,32 @@ _hal_volume_policy_check (GnomeVFSVolume
> 	if (libhal_volume_should_ignore (hal_volume))
> 		goto out;
> 
>-	/* if mounted; discard if it got a FHS-2.3 name (to get /, /boot, /usr etc. out of the way) 
>-	 *
>-	 * (yes, this breaks if the user mounts it later but that is not normally the case for such volumes)
>-	 */
>+	/* if mounted and it's in fstab, discard it */
> 	if (libhal_volume_is_mounted (hal_volume)) {
>-		int i;
>+		static GList *fstab = NULL;
>+		GList *new_fstab, *l;
>+		GnomeVFSUnixMountPoint *mount;
> 		const char *mount_point;
> 
> 		mount_point = libhal_volume_get_mount_point (hal_volume);
>-		/* blacklist fhs2.3 top level mount points */
>-		if (mount_point != NULL) {
>-			for (i = 0; fhs23_toplevel_mount_points[i] != NULL; i++) {
>-				if (strcmp (mount_point, fhs23_toplevel_mount_points[i]) == 0)
>-					goto out;
>+
>+		if (_gnome_vfs_get_unix_mount_table (&new_fstab)) {
>+			/* fstab has been updated, free old list */
>+			g_list_foreach (fstab, (GFunc)_gnome_vfs_unix_mount_point_free,
>+							NULL);
>+			g_list_free (fstab);
>+			fstab = new_fstab;
>+		}
>+
>+		for (l = fstab; l != NULL; l = l->next) {
>+			mount = l->data;
>+
>+			if (strcmp (mount_point, mount->mount_path) == 0) {
>+				goto out;
> 			}
> 		}
> 	}
>+
> #if 0
> 	label = libhal_volume_get_label (hal_volume);
> 	fstype = libhal_volume_get_fstype (hal_volume);

Actions: View | Diff

Attachments on bug 384201: 278881 | 282201