From a8a6a503ecc2a6be01671a2a1de47a90baad37a7 Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Tue, 4 Feb 2003 12:24:37 +0000 Subject: [PATCH] Look first into /etc/mtab, then into /etc/fstab. --- CHANGES | 9 +++++---- dump/dump.8.in | 9 ++++++++- dump/optr.c | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index c68714e..ea3b003 100644 --- 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 ?????????????????) ======================================================================= @@ -15,12 +15,13 @@ Changes between versions 0.4b32 and 0.4b33 (released ?????????????????) an extra, unrelated error message). Thanks to Dragan Krnic 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 , Elliott Mitchell - , Greg Edwards . - (fixes Debian bugs #147086 and #160305, Sourceforge bug #618699) + , Greg Edwards , + Brian Hoy . (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 diff --git a/dump/dump.8.in b/dump/dump.8.in index b449701..23243bc 100644 --- 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. .\" -.\" $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 @@ -409,6 +409,8 @@ option causes 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 @@ -421,6 +423,8 @@ exits immediately. Is like .BR \-W , but prints only recognized filesystems in +.I /etc/mtab +and .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/mtab +dump table: mounted file systems +.TP .I /etc/group to find group .I operator diff --git a/dump/optr.c b/dump/optr.c index 5f275ed..b9a05c2 100644 --- a/dump/optr.c +++ b/dump/optr.c @@ -41,7 +41,7 @@ #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 @@ -487,7 +487,7 @@ getfstab(void) 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++) { -- 2.39.5