about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_mount12
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 759a36f37..96484ee20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-14  Peter Stephenson  <pws@csr.com>
+
+	* 17542 (Thomas Stromberg <thomas@stromberg.org>):
+	Completion/Unix/Command/_mount: most systems don't have /etc/mnt.
+
 2002-08-12  Peter Stephenson  <pws@csr.com>
 
 	* 17482 (Karl Tomlinson): Src/Modules/termcap.c,
diff --git a/Completion/Unix/Command/_mount b/Completion/Unix/Command/_mount
index 8fddc4e6f..289f605a2 100644
--- a/Completion/Unix/Command/_mount
+++ b/Completion/Unix/Command/_mount
@@ -748,17 +748,17 @@ udevordir)
     local dev_tmp mp_tmp mline
 
     case "$OSTYPE" in
-    freebsd*)
+    linux*|irix*)
+      tmp=( "${(@f)$(< /etc/mtab)}" )
+      dev_tmp=( "${(@)${(@)tmp%% *}:#none}" )
+      mp_tmp=( "${(@)${(@)tmp#* }%% *}" )
+      ;;
+    *)
       /sbin/mount | while read mline; do
         dev_tmp=( $dev_tmp $mline[(w)1] )
         mp_tmp=( $mp_tmp $mline[(w)3] )
       done
       ;;
-    *)
-      tmp=( "${(@f)$(< /etc/mtab)}" )
-      dev_tmp=( "${(@)${(@)tmp%% *}:#none}" )
-      mp_tmp=( "${(@)${(@)tmp#* }%% *}" )
-      ;;
     esac
 
     _alternative \