Awful hack to ensure exit status gets propogated in command-line programs

diff --git a/mount/config-cobalt-linux b/mount/config-cobalt-linux
index 1a1f787..1aef67e 100644 (file)
--- a/mount/config-cobalt-linux
+++ b/mount/config-cobalt-linux
@@ -2,3 +2,4 @@ long_fstypes=1
 fstab_file=/etc/fstab
 smbclient_path=smbclient
 nmblookup_path=nmblookup
+show_used=1

diff --git a/mount/config-coherent-linux b/mount/config-coherent-linux
index 4d53400..9aa53aa 100644 (file)
--- a/mount/config-coherent-linux
+++ b/mount/config-coherent-linux
@@ -4,3 +4,4 @@ long_fstypes=1
 fstab_file=/etc/fstab
 smbclient_path=smbclient
 nmblookup_path=nmblookup
+show_used=1

diff --git a/mount/config-corel-linux b/mount/config-corel-linux
index 7f40f1f..3e0aa38 100644 (file)
--- a/mount/config-corel-linux
+++ b/mount/config-corel-linux
@@ -3,3 +3,4 @@ long_fstypes=1
 fstab_file=/etc/fstab
 smbclient_path=smbclient
 nmblookup_path=nmblookup
+show_used=1

diff --git a/mount/config-debian-linux b/mount/config-debian-linux
index 4b59e4a..20fdcd0 100644 (file)
--- a/mount/config-debian-linux
+++ b/mount/config-debian-linux
@@ -5,3 +5,4 @@ smbclient_path=smbclient
 nmblookup_path=nmblookup
 auto_file=/etc/am-utils/amd.conf
 autofs_file=/etc/auto.master
+show_used=1

diff --git a/mount/config-freebsd b/mount/config-freebsd
index b32419d..5ca156c 100644 (file)
--- a/mount/config-freebsd
+++ b/mount/config-freebsd
@@ -5,3 +5,4 @@ auto_file=
 smbclient_path=smbclient
 long_fstypes=1
 fstab_file=/etc/fstab
+show_used=1

diff --git a/mount/config-generic-linux b/mount/config-generic-linux
index 1a1f787..1aef67e 100644 (file)
--- a/mount/config-generic-linux
+++ b/mount/config-generic-linux
@@ -2,3 +2,4 @@ long_fstypes=1
 fstab_file=/etc/fstab
 smbclient_path=smbclient
 nmblookup_path=nmblookup
+show_used=1

diff --git a/mount/config-gentoo-linux b/mount/config-gentoo-linux
index 71d1058..6b05d71 100644 (file)
--- a/mount/config-gentoo-linux
+++ b/mount/config-gentoo-linux
@@ -3,3 +3,4 @@ fstab_file=/etc/fstab
 smbclient_path=smbclient
 nmblookup_path=nmblookup
 autofs_file=/etc/autofs/auto.master
+show_used=1

diff --git a/mount/config-hpux b/mount/config-hpux
index b32419d..5ca156c 100644 (file)
--- a/mount/config-hpux
+++ b/mount/config-hpux
@@ -5,3 +5,4 @@ auto_file=
 smbclient_path=smbclient
 long_fstypes=1
 fstab_file=/etc/fstab
+show_used=1

diff --git a/mount/config-irix b/mount/config-irix
index a32967b..9af47cd 100644 (file)
--- a/mount/config-irix
+++ b/mount/config-irix
@@ -3,3 +3,4 @@ smbclient_path=/usr/local/samba/bin/smbclient
 long_fstypes=1
 fstab_file=/etc/fstab
 autofs_file=/etc/auto_master
+show_used=1

diff --git a/mount/config-lfs-linux b/mount/config-lfs-linux
index 80e4fc9..b8b992d 100644 (file)
--- a/mount/config-lfs-linux
+++ b/mount/config-lfs-linux
@@ -5,3 +5,4 @@ nmblookup_path=
 long_fstypes=1
 smbclient_path=
 fstab_file=/etc/fstab
+show_used=1

diff --git a/mount/config-macos b/mount/config-macos
index 8b0acd3..727db20 100644 (file)
--- a/mount/config-macos
+++ b/mount/config-macos
@@ -4,3 +4,4 @@ browse_server=
 auto_file=
 smbclient_path=smbclient
 long_fstypes=1
+show_used=1

diff --git a/mount/config-mandrake-linux b/mount/config-mandrake-linux
index 4d53400..9aa53aa 100644 (file)
--- a/mount/config-mandrake-linux
+++ b/mount/config-mandrake-linux
@@ -4,3 +4,4 @@ long_fstypes=1
 fstab_file=/etc/fstab
 smbclient_path=smbclient
 nmblookup_path=nmblookup
+show_used=1

diff --git a/mount/config-msc-linux b/mount/config-msc-linux
index 4d53400..9aa53aa 100644 (file)
--- a/mount/config-msc-linux
+++ b/mount/config-msc-linux
@@ -4,3 +4,4 @@ long_fstypes=1
 fstab_file=/etc/fstab
 smbclient_path=smbclient
 nmblookup_path=nmblookup
+show_used=1

diff --git a/mount/config-netbsd b/mount/config-netbsd
index b32419d..5ca156c 100755 (executable)
--- a/mount/config-netbsd
+++ b/mount/config-netbsd
@@ -5,3 +5,4 @@ auto_file=
 smbclient_path=smbclient
 long_fstypes=1
 fstab_file=/etc/fstab
+show_used=1

diff --git a/mount/config-open-linux b/mount/config-open-linux
index 57f8892..b9c4d6d 100644 (file)
--- a/mount/config-open-linux
+++ b/mount/config-open-linux
@@ -3,3 +3,4 @@ long_fstypes=1
 fstab_file=/etc/fstab
 smbclient_path=smbclient
 nmblookup_path=nmblookup
+show_used=1

diff --git a/mount/config-open-linux-3.1e b/mount/config-open-linux-3.1e
index 8399b70..2479498 100644 (file)
--- a/mount/config-open-linux-3.1e
+++ b/mount/config-open-linux-3.1e
@@ -3,3 +3,4 @@ long_fstypes=1
 fstab_file=/etc/fstab
 smbclient_path=smbclient
 nmblookup_path=nmblookup
+show_used=1

diff --git a/mount/config-openbsd b/mount/config-openbsd
index b32419d..5ca156c 100644 (file)
--- a/mount/config-openbsd
+++ b/mount/config-openbsd
@@ -5,3 +5,4 @@ auto_file=
 smbclient_path=smbclient
 long_fstypes=1
 fstab_file=/etc/fstab
+show_used=1

diff --git a/mount/config-openmamba-linux b/mount/config-openmamba-linux
index 9c5d33e..17cd9b3 100644 (file)
--- a/mount/config-openmamba-linux
+++ b/mount/config-openmamba-linux
@@ -3,3 +3,4 @@ long_fstypes=1
 fstab_file=/etc/fstab
 smbclient_path=smbclient
 nmblookup_path=nmblookup
+show_used=1

diff --git a/mount/config-osf1 b/mount/config-osf1
index 3fe69c5..2da618a 100644 (file)
--- a/mount/config-osf1
+++ b/mount/config-osf1
@@ -5,3 +5,4 @@ nmblookup_path=/usr/local/samba/bin/nmblookup
 long_fstypes=1
 smbclient_path=/usr/local/samba/bin/smbclient
 fstab_file=/etc/fstab
+show_used=1

diff --git a/mount/config-redhat-linux b/mount/config-redhat-linux
index 9c5d33e..17cd9b3 100644 (file)
--- a/mount/config-redhat-linux
+++ b/mount/config-redhat-linux
@@ -3,3 +3,4 @@ long_fstypes=1
 fstab_file=/etc/fstab
 smbclient_path=smbclient
 nmblookup_path=nmblookup
+show_used=1

diff --git a/mount/config-redhat-linux-5.0-6.0 b/mount/config-redhat-linux-5.0-6.0
index b06e671..9177d6d 100644 (file)
--- a/mount/config-redhat-linux-5.0-6.0
+++ b/mount/config-redhat-linux-5.0-6.0
@@ -4,3 +4,4 @@ long_fstypes=1
 fstab_file=/etc/fstab
 smbclient_path=smbclient
 nmblookup_path=nmblookup
+show_used=1

diff --git a/mount/config-redhat-linux-6.1-* b/mount/config-redhat-linux-6.1-*
index 4d53400..9aa53aa 100644 (file)
--- a/mount/config-redhat-linux-6.1-*
+++ b/mount/config-redhat-linux-6.1-*
@@ -4,3 +4,4 @@ long_fstypes=1
 fstab_file=/etc/fstab
 smbclient_path=smbclient
 nmblookup_path=nmblookup
+show_used=1

diff --git a/mount/config-slackware-linux b/mount/config-slackware-linux
index c177a36..25069bb 100644 (file)
--- a/mount/config-slackware-linux
+++ b/mount/config-slackware-linux
@@ -2,3 +2,4 @@ fstab_file=/etc/fstab
 long_fstypes=1
 smbclient_path=smbclient
 nmblookup_path=nmblookup
+show_used=1

diff --git a/mount/config-sol-linux b/mount/config-sol-linux
index d919982..a7a8414 100644 (file)
--- a/mount/config-sol-linux
+++ b/mount/config-sol-linux
@@ -7,3 +7,4 @@ passwd_pindex=1
 passwd_cindex=2
 passwd_mindex=4
 by_view=0
+show_used=1

diff --git a/mount/config-solaris b/mount/config-solaris
index f51c10a..6c20607 100644 (file)
--- a/mount/config-solaris
+++ b/mount/config-solaris
@@ -3,3 +3,4 @@ fstab_file=/etc/vfstab
 long_fstypes=1
 smbclient_path=/usr/local/samba/bin/smbclient
 nmblookup_path=/usr/local/samba/bin/nmblookup
+show_used=1

diff --git a/mount/config-suse-linux b/mount/config-suse-linux
index 69aceec..288c8bd 100644 (file)
--- a/mount/config-suse-linux
+++ b/mount/config-suse-linux
@@ -3,3 +3,4 @@ fstab_file=/etc/fstab
 autofs_file=/etc/auto.master
 smbclient_path=smbclient
 nmblookup_path=nmblookup
+show_used=1

diff --git a/mount/config-trustix-linux b/mount/config-trustix-linux
index 4d53400..9aa53aa 100644 (file)
--- a/mount/config-trustix-linux
+++ b/mount/config-trustix-linux
@@ -4,3 +4,4 @@ long_fstypes=1
 fstab_file=/etc/fstab
 smbclient_path=smbclient
 nmblookup_path=nmblookup
+show_used=1

diff --git a/mount/config-turbo-linux b/mount/config-turbo-linux
index b06e671..9177d6d 100644 (file)
--- a/mount/config-turbo-linux
+++ b/mount/config-turbo-linux
@@ -4,3 +4,4 @@ long_fstypes=1
 fstab_file=/etc/fstab
 smbclient_path=smbclient
 nmblookup_path=nmblookup
+show_used=1

diff --git a/mount/config-turbo-linux-4.0 b/mount/config-turbo-linux-4.0
index b06e671..9177d6d 100644 (file)
--- a/mount/config-turbo-linux-4.0
+++ b/mount/config-turbo-linux-4.0
@@ -4,3 +4,4 @@ long_fstypes=1
 fstab_file=/etc/fstab
 smbclient_path=smbclient
 nmblookup_path=nmblookup
+show_used=1

diff --git a/mount/config-united-linux b/mount/config-united-linux
index 69aceec..288c8bd 100644 (file)
--- a/mount/config-united-linux
+++ b/mount/config-united-linux
@@ -3,3 +3,4 @@ fstab_file=/etc/fstab
 autofs_file=/etc/auto.master
 smbclient_path=smbclient
 nmblookup_path=nmblookup
+show_used=1

diff --git a/mount/config-unixware b/mount/config-unixware
index f51c10a..6c20607 100644 (file)
--- a/mount/config-unixware
+++ b/mount/config-unixware
@@ -3,3 +3,4 @@ fstab_file=/etc/vfstab
 long_fstypes=1
 smbclient_path=/usr/local/samba/bin/smbclient
 nmblookup_path=/usr/local/samba/bin/nmblookup
+show_used=1

diff --git a/mount/config.info b/mount/config.info
index e12c8e3..134343e 100644 (file)
--- a/mount/config.info
+++ b/mount/config.info
@@ -2,6 +2,7 @@ line1=Configurable options,11
 browse_server=Server to request browse list from,3,localhost
 long_fstypes=Show long filesystem type names,1,1-Yes,0-No
 sort_mode=Sort filesystems by,1,2-Mount point,1-Type,0-Order in files
+show_used=Show used disk space in filesystems list,1,1-Yes,0-No
 delete_under=Delete directory when un-mounting if under,3,Never delete
 line2=System configuration,11
 fstab_file=File listing filesystems mounted at boot time,0

diff --git a/mount/index.cgi b/mount/index.cgi
index c778774..f8d6a4f 100755 (executable)
--- a/mount/index.cgi
+++ b/mount/index.cgi
@@ -50,7 +50,8 @@ if (@visible) {
        print &ui_columns_start([ $text{'index_dir'},
                                $text{'index_type'},
                                $text{'index_dev'},
-                               $text{'index_used'},
+                               $config{'show_used'} ? ( $text{'index_used'} )
+                                                    : ( ),
                                $text{'index_use'},
                                $text{'index_perm'} ], 100);
        foreach $m (@visible) {
@@ -80,14 +81,19 @@ if (@visible) {
                $fsn .= " ($minfo[2])" if (uc($fsn) ne uc($minfo[2]));
                push(@cols, $minfo[2] eq "*" ? $text{'index_auto'} : $fsn);
                push(@cols, &device_name($minfo[1]));
-               ($total, $free) = &disk_space($minfo[2],$minfo[0]);
-               if ($total) {
-                       $pc = int(100*($total-$free) / $total);
-                       push(@cols, $pc >= 99 ? "<font color=red>$pc %</font>" :
-                                   $pc >= 95 ? "<font color=orange>$pc %</font>" : $pc."%");
-                       }
-               else {
-                       push(@cols, "");
+               if ($config{'show_used'}) {
+                       # Add disk space used column
+                       ($total, $free) = &disk_space($minfo[2],$minfo[0]);
+                       if ($total) {
+                               $pc = int(100*($total-$free) / $total);
+                               push(@cols,
+                                $pc >= 99 ? "<font color=red>$pc %</font>" :
+                                $pc >= 95 ? "<font color=orange>$pc %</font>" :
+                                            $pc."%");
+                               }
+                       else {
+                               push(@cols, "");
+                               }
                        }
                if (&can_edit_fs(@minfo)) {
                        push(@cols,