summaryrefslogtreecommitdiff
path: root/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.xz
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch')
-rw-r--r--gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch77
1 files changed, 77 insertions, 0 deletions
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch
new file mode 100644
index 00000000000..e76a9837136
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch
@@ -0,0 +1,77 @@
+From 8427c2daf543353f42b932b5137b6ec590f6589b Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sat, 2 Oct 2010 00:42:31 +0200
+Subject: [PATCH 7/9] Prevent duplicated volumes, bug #193083
+
+---
+ libgnomevfs/gnome-vfs-unix-mounts.c | 39 +++++++++++++++++++++++++++++++++-
+ 1 files changed, 37 insertions(+), 2 deletions(-)
+
+diff --git a/libgnomevfs/gnome-vfs-unix-mounts.c b/libgnomevfs/gnome-vfs-unix-mounts.c
+index 51a009b..3eee305 100644
+--- a/libgnomevfs/gnome-vfs-unix-mounts.c
++++ b/libgnomevfs/gnome-vfs-unix-mounts.c
+@@ -40,6 +40,10 @@
+ #ifdef HAVE_POLL_H
+ #include <poll.h>
+ #endif
++
++#include <limits.h>
++#include <stdlib.h>
++
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <sys/time.h>
+@@ -290,6 +294,15 @@ _gnome_vfs_get_current_unix_mounts (GList **return_list)
+
+ mount_entry->mount_path = g_strdup (mntent->mnt_dir);
+ mount_entry->device_path = g_strdup (mntent->mnt_fsname);
++
++ if (g_file_test (mntent->mnt_fsname, G_FILE_TEST_IS_SYMLINK)) {
++ char rpath[PATH_MAX];
++ if (realpath (mntent->mnt_fsname, rpath)) {
++ g_free (mount_entry->device_path);
++ mount_entry->device_path = g_strdup (rpath);
++ }
++ }
++
+ mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
+
+ g_hash_table_insert (mounts_hash,
+@@ -571,9 +584,31 @@ _gnome_vfs_get_unix_mount_table (GList **return_list)
+ }
+
+ mount_entry = g_new0 (GnomeVFSUnixMountPoint, 1);
+-
++
++ if(strlen(mntent->mnt_fsname) >= 5 && !strncmp (mntent->mnt_fsname, "UUID=", 5)) {
++ mount_entry->device_path = g_strdup_printf ("/dev/disk/by-uuid/%s", mntent->mnt_fsname+5);
++ }
++ else if(strlen(mntent->mnt_fsname) >= 6 && !strncmp (mntent->mnt_fsname, "LABEL=", 6)) {
++ mount_entry->device_path = g_strdup_printf ("/dev/disk/by-label/%s", mntent->mnt_fsname+6);
++ }
++ else {
++ mount_entry->device_path = g_strdup (mntent->mnt_fsname);
++ }
++
++ if (g_file_test (mount_entry->device_path, G_FILE_TEST_IS_SYMLINK)) {
++ char rpath[PATH_MAX];
++ if (realpath (mount_entry->device_path, rpath)) {
++ g_free (mount_entry->device_path);
++ mount_entry->device_path = g_strdup (rpath);
++ }
++ else {
++ g_free (mount_entry->device_path);
++ g_free (mount_entry);
++ continue;
++ }
++ }
++
+ mount_entry->mount_path = g_strdup (mntent->mnt_dir);
+- mount_entry->device_path = g_strdup (mntent->mnt_fsname);
+ mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
+
+ #ifdef HAVE_HASMNTOPT
+--
+1.7.3
+