From 3aa040d25f5556b6e9bf92c784072aba7620f729 Mon Sep 17 00:00:00 2001
From: Igor Murzov <e-mail@date.by>
Date: Sun, 22 Jul 2012 16:38:30 +0400
Subject: [PATCH] mount.linux: Clean up mount options, remove duplicates.

---
 completions/mount.linux | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/completions/mount.linux b/completions/mount.linux
index 9d587352..d1c08c50 100644
--- a/completions/mount.linux
+++ b/completions/mount.linux
@@ -72,15 +72,14 @@ _mount()
             # no completion if $cur is opt=smth
             [[ "$cur" == *=* ]] && return
             # mount options
-            COMPREPLY=( $(compgen -W 'loop async {,no}atime {,no}auto
+            COMPREPLY=( $(compgen -W 'loop {,a}sync {,no}atime {,no}auto
                 {,fs,def,root}context= defaults {,no}dev {,no}diratime dirsync
                 {,no}exec group {,no}iversion {,no}mand _netdev nofail
                 {,no}relatime {,no}strictatime {,no}suid owner remount ro rw
-                sync {,no}user users' -- "$cur") )
+                {,no}user users' -- "$cur") )
             case "$fstype" in
             adfs|auto)
-                COMPREPLY+=( $(compgen -W 'uid= gid= {own,oth}mask=' -- \
-                    "$cur") )
+                COMPREPLY+=( $(compgen -W '{u,g}id= {own,oth}mask=' -- "$cur") )
                 ;;&
             affs|auto)
                 COMPREPLY+=( $(compgen -W '{u,g}id= set{u,g}id= mode= protect
@@ -97,7 +96,7 @@ _mount()
             cifs|auto)
                 COMPREPLY+=( $(compgen -W 'user= password= credentials= {u,g}id=
                     force{u,g}id port= servern= netbiosname= {file,dir}_mode=
-                    ip= domain= guest iocharset ro rw {,no}setuids {,no,dyn}perm
+                    ip= domain= guest iocharset {,no}setuids {,no,dyn}perm
                     directio {,no}mapchars {,no}intr hard soft noacl nocase sec=
                     nobrl sfu {,no}serverino nounix nouser_xattr {r,w}size=
                     rwpidforward backup{u,g}id cache=' -- "$cur") )
@@ -143,8 +142,8 @@ _mount()
                 ;;&
             ntfs-3g)
                 COMPREPLY+=( $(compgen -W '{u,g}id= {u,f,d}mask= usermapping=
-                    permissions inherit ro locale= force {,no}recover
-                    ignore_case remove_hiberfile {,no,rel}atime show_sys_files
+                    permissions inherit locale= force {,no}recover
+                    ignore_case remove_hiberfile show_sys_files
                     hide_{hid,dot}_files windows_names allow_other max_read=
                     silent no_def_opts streams_interface= user_xattr efs_raw
                     {,no}compression debug no_detach' -- "$cur") )
@@ -174,7 +173,7 @@ _mount()
                 COMPREPLY+=( $(compgen -W 'allocsize= {,no}attr2 barrier dmapi
                     {,no}grpid {bsd,sysv}groups ihashsize= {,no}ikeep inode64
                     {,no}largeio logbufs= logbsize= logdev= rtdev= mtpt= noalign
-                    noatime norecovery nouuid osyncisosync {u,g,p}qnoenforce
+                    norecovery nouuid osyncisosync {u,g,p}qnoenforce
                     {,u,usr,g,grp,p,prj}quota sunit= swidth= swalloc' \
                     -- "$cur") )
                 ;;&