diff options
author | David Zeuthen <davidz@redhat.com> | 2012-01-24 16:38:44 -0500 |
---|---|---|
committer | David Zeuthen <davidz@redhat.com> | 2012-01-24 16:38:44 -0500 |
commit | 37d4bf323a05a0b46fa3cb2b4cc96aa4ceca598e (patch) | |
tree | ad5d424cf76a510452a9e8cdddc479fe5fd2c4a0 /monitor | |
parent | ce3bda236c2c85517260fc138669acf91af1092f (diff) | |
download | gvfs-37d4bf323a05a0b46fa3cb2b4cc96aa4ceca598e.tar.gz |
For mount options, switch from comment=gvfs to x-gvfs
Recent util-linux (2.21+) supports any x-* option.
Signed-off-by: David Zeuthen <davidz@redhat.com>
Diffstat (limited to 'monitor')
-rw-r--r-- | monitor/udisks2/gvfsudisks2volume.c | 6 | ||||
-rw-r--r-- | monitor/udisks2/gvfsudisks2volumemonitor.c | 6 | ||||
-rw-r--r-- | monitor/udisks2/what-is-shown.txt | 14 |
3 files changed, 13 insertions, 13 deletions
diff --git a/monitor/udisks2/gvfsudisks2volume.c b/monitor/udisks2/gvfsudisks2volume.c index d4a5b3fd..af2cdf3b 100644 --- a/monitor/udisks2/gvfsudisks2volume.c +++ b/monitor/udisks2/gvfsudisks2volume.c @@ -159,14 +159,14 @@ apply_options_from_fstab (GVfsUDisks2Volume *volume, gchar *name; gchar *icon_name; - name = gvfs_udisks2_utils_lookup_fstab_options_value (fstab_options, "comment=gvfs-name="); + name = gvfs_udisks2_utils_lookup_fstab_options_value (fstab_options, "x-gvfs-name="); if (name != NULL) { g_free (volume->name); volume->name = name; } - icon_name = gvfs_udisks2_utils_lookup_fstab_options_value (fstab_options, "comment=gvfs-icon="); + icon_name = gvfs_udisks2_utils_lookup_fstab_options_value (fstab_options, "x-gvfs-icon="); if (icon_name != NULL) { volume->icon = g_themed_icon_new_with_default_fallbacks (icon_name); @@ -353,7 +353,7 @@ update_volume (GVfsUDisks2Volume *volume) volume->icon = g_themed_icon_new_with_default_fallbacks (hint); } - /* Use comment=gvfs-name=The%20Name and comment=gvfs-icon=foo-name, if available */ + /* Use x-gvfs-name=The%20Name and x-gvfs-icon=foo-name, if available */ g_variant_iter_init (&iter, udisks_block_get_configuration (block)); while (g_variant_iter_next (&iter, "(&s@a{sv})", &configuration_type, &configuration_value)) { diff --git a/monitor/udisks2/gvfsudisks2volumemonitor.c b/monitor/udisks2/gvfsudisks2volumemonitor.c index 4f378a68..dfb42519 100644 --- a/monitor/udisks2/gvfsudisks2volumemonitor.c +++ b/monitor/udisks2/gvfsudisks2volumemonitor.c @@ -607,18 +607,18 @@ should_include (const gchar *mount_path, g_return_val_if_fail (mount_path != NULL, FALSE); - /* The comment=gvfs-show option trumps everything else */ + /* The x-gvfs-show option trumps everything else */ if (options != NULL) { gchar *value; - value = gvfs_udisks2_utils_lookup_fstab_options_value (options, "comment=gvfs-show"); + value = gvfs_udisks2_utils_lookup_fstab_options_value (options, "x-gvfs-show"); if (value != NULL) { ret = TRUE; g_free (value); goto out; } - value = gvfs_udisks2_utils_lookup_fstab_options_value (options, "comment=gvfs-hide"); + value = gvfs_udisks2_utils_lookup_fstab_options_value (options, "x-gvfs-hide"); if (value != NULL) { ret = FALSE; diff --git a/monitor/udisks2/what-is-shown.txt b/monitor/udisks2/what-is-shown.txt index ef065221..4013cf0f 100644 --- a/monitor/udisks2/what-is-shown.txt +++ b/monitor/udisks2/what-is-shown.txt @@ -24,14 +24,14 @@ If the directory for a device is known and outside /media, $HOME then the device is not shown in the user interface. Additionally, if any of component directories in its directory starts with a dot ("."), the device is not shown either. This policy may be overriden by use of -the options comment=gvfs-show and comment=gvfs-hide. +the options x-gvfs-show and x-gvfs-hide. The name and icon to use for a device is chosen according to certain heuristics - for example, if a device has a filesystem label, it is used - if not, some other characteristic is used. The options -comment=gvfs-name=<value> and comment=gvfs-icon=<value> can be used to -override this policy with <value> being an URL-encoded string. For -icons, the Icon Naming Specification is used. +x-gvfs-name=<value> and x-gvfs-icon=<value> can be used to override +this policy with <value> being an URL-encoded string. For icons, the +Icon Naming Specification is used. Users are advised to use (stable) symlinks in the /dev/disk/ hierarchy for /etc/fstab entries instead of the kernel names sda, sdb and so @@ -46,13 +46,13 @@ EXAMPLES -------- # forcibly hide device in user interface -/dev/disk/by-id/ata-HITACHI_HTS723232A7A364_E3834563KRG2HN-part1 /home/davidz/Data auto defaults,comment=gvfs-hide 0 0 +/dev/disk/by-id/ata-HITACHI_HTS723232A7A364_E3834563KRG2HN-part1 /home/davidz/Data auto defaults,x-gvfs-hide 0 0 # forcibly show device in user interface and with name "My Movies" -/dev/disk/by-uuid/4CAE8E5B5AF47502 /Movies auto defaults,comment=gvfs-show,comment=gvfs-name=My%20Movies 0 0 +/dev/disk/by-uuid/4CAE8E5B5AF47502 /Movies auto defaults,x-gvfs-show,x-gvfs-name=My%20Movies 0 0 # forcibly show NFS mount in user interface -10.200.0.210:/tank/media /mnt/Filer nfs4 default,users,noauto,comment=gvfs-show 0 0 +10.200.0.210:/tank/media /mnt/Filer nfs4 default,users,noauto,x-gvfs-show 0 0 INFLUENTIAL UDEV PROPERTIES --------------------------- |