diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2005-09-08 02:05:13 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2005-09-08 02:05:13 +0000 |
| commit | e37378ed1e6b03406fb4e62b503812d7bfb43b10 (patch) | |
| tree | cb9c074e90abb7415919d35162e4b67c9da786bb /gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.5.1-use-pmount-2.patch | |
| parent | initial import #86697 (diff) | |
| download | historical-e37378ed1e6b03406fb4e62b503812d7bfb43b10.tar.gz historical-e37378ed1e6b03406fb4e62b503812d7bfb43b10.tar.bz2 historical-e37378ed1e6b03406fb4e62b503812d7bfb43b10.zip | |
rev bump to 1.5.1. Use azarah's patch for g-v-m's pmount usage since it's better
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.5.1-use-pmount-2.patch')
| -rw-r--r-- | gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.5.1-use-pmount-2.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.5.1-use-pmount-2.patch b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.5.1-use-pmount-2.patch new file mode 100644 index 000000000000..962d0e1f55ef --- /dev/null +++ b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.5.1-use-pmount-2.patch @@ -0,0 +1,50 @@ +diff -urpN gnome-volume-manager-1.5.1/src/manager.c gnome-volume-manager-1.5.1.az/src/manager.c +--- gnome-volume-manager-1.5.1/src/manager.c 2005-08-25 22:53:51.000000000 +0200 ++++ gnome-volume-manager-1.5.1.az/src/manager.c 2005-09-07 22:33:43.000000000 +0200 +@@ -47,6 +47,11 @@ + + #define NAUTILUS_COMMAND BIN_NAUTILUS" -n --no-desktop %m" + ++#define BIN_PMOUNT "/usr/bin/pmount-hal" ++#define PMOUNT_COMMAND BIN_PMOUNT" %h" ++#define BIN_PUNMOUNT "/usr/bin/pumount" ++#define PUNMOUNT_COMMAND BIN_PUNMOUNT" %d" ++ + static struct gvm_configuration config; + static LibHalContext *hal_ctx; + +@@ -1170,13 +1175,18 @@ gvm_device_mounted (const char *udi) + static gboolean + gvm_device_mount (const char *udi, const char *device, const char *mount_point) + { ++ char *mount_command = MOUNT_COMMAND; + char *key; + + key = g_strdup (udi); + g_hash_table_insert (mount_table, key, key); ++ ++ /* Only check executable, as suid binaries might not be readable */ ++ if (g_file_test (BIN_PMOUNT, G_FILE_TEST_IS_EXECUTABLE)) ++ mount_command = PMOUNT_COMMAND; + + dbg ("mounting %s...\n", udi); +- if (gvm_run_command (MOUNT_COMMAND, udi, device, mount_point)) ++ if (gvm_run_command (mount_command, udi, device, mount_point)) + return TRUE; + + dbg ("mount failed: %s\n", udi); +@@ -1194,7 +1204,13 @@ gvm_device_mount (const char *udi, const + static gboolean + gvm_device_unmount (const char *udi, const char *device, const char *mount_point) + { +- return gvm_run_command (UNMOUNT_COMMAND, udi, device, mount_point); ++ char *unmount_command = UNMOUNT_COMMAND; ++ ++ /* Only check executable, as suid binaries might not be readable */ ++ if (g_file_test (BIN_PUNMOUNT, G_FILE_TEST_IS_EXECUTABLE)) ++ unmount_command = PUNMOUNT_COMMAND; ++ ++ return gvm_run_command (unmount_command, udi, device, mount_point); + } + + /* |