r20554 - in /desktop/unstable/gnome-vfs/debian: changelog patches/06_blacklist-directories.patch

[otavio at users.alioth.debian.org]

Author: otavio
Date: Thu Jul  2 18:56:43 2009
New Revision: 20554

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20554
Log:
Change mounting blacklist to be recursive since live-installer is
going to mount /target on /live/installer directory.

Modified:
    desktop/unstable/gnome-vfs/debian/changelog
    desktop/unstable/gnome-vfs/debian/patches/06_blacklist-directories.patch

Modified: desktop/unstable/gnome-vfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/changelog?rev=20554&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/changelog (original)
+++ desktop/unstable/gnome-vfs/debian/changelog Thu Jul  2 18:56:43 2009
@@ -1,3 +1,10 @@
+gnome-vfs (1:2.24.1-3) UNRELEASED; urgency=low
+
+  * Change mounting blacklist to be recursive since live-installer is
+    going to mount /target on /live/installer directory.
+
+ -- Otavio Salvador <otavio at debian.org>  Thu, 02 Jul 2009 15:56:01 -0300
+
 gnome-vfs (1:2.24.1-2) unstable; urgency=low
 
   * Add '/live/installer' to the mounting blacklist.

Modified: desktop/unstable/gnome-vfs/debian/patches/06_blacklist-directories.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/06_blacklist-directories.patch?rev=20554&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/06_blacklist-directories.patch (original)
+++ desktop/unstable/gnome-vfs/debian/patches/06_blacklist-directories.patch Thu Jul  2 18:56:43 2009
@@ -1,8 +1,7 @@
-Index: gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c
-===================================================================
+unchanged:
 --- gnome-vfs-2.18.1.orig/libgnomevfs/gnome-vfs-hal-mounts.c	2007-05-03 23:07:30.686398250 +0200
 +++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c	2007-05-03 23:12:04.779528000 +0200
-@@ -645,6 +645,15 @@
+@@ -645,7 +645,20 @@
  		"/var",
  		"/proc",
  		"/sbin",
@@ -12,9 +11,27 @@
 +		"/var/mail",
 +		"/var/run",
 +		"/var/tmp",
-+		"/live/cow",
-+		"/live/image",
-+		"/live/installer",
++ 		NULL
++ 	};
++
++	const char *fhs23_recursive_toplevel_mount_points[] = {
++ 		"/live/cow",
++ 		"/live/image",
++ 		"/live/installer",
  		NULL
  	};
  
+ 	ret = FALSE;
+@@ -741,6 +746,12 @@
+ 				if (strcmp (mount_point, fhs23_toplevel_mount_points[i]) == 0)
+ 					goto out;
+ 			}
++
++			for (i = 0; fhs23_recursive_toplevel_mount_points[i] != NULL; i++) {
++				if (strncmp (mount_point, fhs23_recursive_toplevel_mount_points[i],
++					    strlen(fhs23_recursive_toplevel_mount_points[i])) == 0)
++					goto out;
++			}
+ 		}
+ 	}
+ #if 0