Look first into /etc/mtab, then into /etc/fstab.

diff --git a/CHANGES b/CHANGES
index c68714e1f05b4a4df2c7e0c419bb522c270bf31e..ea3b003130cf214268edc7e7dc6ae4a6b07c1da7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.209 2003/01/24 11:01:43 stelian Exp $
+$Id: CHANGES,v 1.210 2003/02/04 12:24:37 stelian Exp $

 
 Changes between versions 0.4b32 and 0.4b33 (released ?????????????????)
 =======================================================================
 
 Changes between versions 0.4b32 and 0.4b33 (released ?????????????????)
 =======================================================================


@@ -15,12 +15,13 @@ Changes between versions 0.4b32 and 0.4b33 (released ?????????????????)
        an extra, unrelated error message). Thanks to Dragan Krnic
        <dkrnic@lycos.com> for reporting this bug.
 
        an extra, unrelated error message). Thanks to Dragan Krnic
        <dkrnic@lycos.com> for reporting this bug.
 

-4.     Made dump look first into /etc/fstab, then into /etc/mtab 
+4.     Made dump look first into /etc/mtab, then into /etc/fstab 

        when searching for filesystem paths. Also fixed some problems
        caused by binding mounts or multiple block device mounts.
        Thanks to Matus Uhlar <uhlar@fantomas.sk>, Elliott Mitchell
        when searching for filesystem paths. Also fixed some problems
        caused by binding mounts or multiple block device mounts.
        Thanks to Matus Uhlar <uhlar@fantomas.sk>, Elliott Mitchell

-       <ehem@m5p.com>, Greg Edwards <gedwards@users.sourceforge.net>.
-       (fixes Debian bugs #147086 and #160305, Sourceforge bug #618699)
+       <ehem@m5p.com>, Greg Edwards <gedwards@users.sourceforge.net>,
+       Brian Hoy <brian.hoy@opus.co.nz>. (fixes Debian bugs #147086
+       and #160305, Sourceforge bugs #618699 and #679832).

 
 5.     Made dump's -I option accept the value '0' meaning all the
        read errors will be ignored. This can be useful when running
 
 5.     Made dump's -I option accept the value '0' meaning all the
        read errors will be ignored. This can be useful when running

diff --git a/dump/dump.8.in b/dump/dump.8.in
index b44970148d47214832d8053fbcc36314f49704bb..23243bc27828b8683e574d969af09389770c969a 100644 (file)
--- a/dump/dump.8.in
+++ b/dump/dump.8.in
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"

-.\"    $Id: dump.8.in,v 1.48 2003/01/21 10:42:27 stelian Exp $
+.\"    $Id: dump.8.in,v 1.49 2003/02/04 12:24:40 stelian Exp $

 .\"
 .TH DUMP 8 "version __VERSION__ of __DATE__" BSD "System management commands"
 .SH NAME
 .\"
 .TH DUMP 8 "version __VERSION__ of __DATE__" BSD "System management commands"
 .SH NAME


@@ -409,6 +409,8 @@ option causes
 to print out, for all file systems in
 .I __DUMPDATES__ ,
 and regognized file systems in
 to print out, for all file systems in
 .I __DUMPDATES__ ,
 and regognized file systems in

+.I /etc/mtab
+and

 .IR /etc/fstab .
 the most recent dump date and level, and highlights those that should be 
 dumped. If the
 .IR /etc/fstab .
 the most recent dump date and level, and highlights those that should be 
 dumped. If the


@@ -421,6 +423,8 @@ exits immediately.
 Is like
 .BR \-W ,
 but prints only recognized filesystems in
 Is like
 .BR \-W ,
 but prints only recognized filesystems in

+.I /etc/mtab
+and

 .I /etc/fstab
 which need to be dumped.
 .TP
 .I /etc/fstab
 which need to be dumped.
 .TP


@@ -535,6 +539,9 @@ dump date records
 .I /etc/fstab
 dump table: file systems and frequency
 .TP
 .I /etc/fstab
 dump table: file systems and frequency
 .TP

+.I /etc/mtab
+dump table: mounted file systems
+.TP

 .I /etc/group
 to find group
 .I operator
 .I /etc/group
 to find group
 .I operator

diff --git a/dump/optr.c b/dump/optr.c
index 5f275ed5b75487ac68454f7ce4ef3e54db9d0338..b9a05c26d4bb9c45b9e1de4b2760ab747583ea65 100644 (file)
--- a/dump/optr.c
+++ b/dump/optr.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: optr.c,v 1.34 2003/01/21 10:42:27 stelian Exp $";
+       "$Id: optr.c,v 1.35 2003/02/04 12:24:40 stelian Exp $";

 #endif /* not lint */
 
 #include <config.h>
 #endif /* not lint */
 
 #include <config.h>


@@ -487,7 +487,7 @@ getfstab(void)
        struct pfstab *pf;
        struct pfstab *pfold = NULL;
        FILE *mntfp;
        struct pfstab *pf;
        struct pfstab *pfold = NULL;
        FILE *mntfp;

-       char *mnttables[] = { _PATH_MNTTAB, _PATH_MOUNTED, 0 };
+       char *mnttables[] = { _PATH_MOUNTED, _PATH_MNTTAB, 0 };

        int i;
 
        for (i = 0; mnttables[i]; i++) {
        int i;
 
        for (i = 0; mnttables[i]; i++) {