Made dump use blkid library.

[dump.git] / dump / optr.c

diff --git a/dump/optr.c b/dump/optr.c
index 8d72cab7ee83e26ed8b4802c5b6d2f51b6964a72..8afe500de71172260c25269ffc22eb052c660e01 100644 (file)
--- a/dump/optr.c
+++ b/dump/optr.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: optr.c,v 1.36 2003/03/30 15:40:36 stelian Exp $";
+       "$Id: optr.c,v 1.38 2004/04/21 08:55:51 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -460,6 +460,12 @@ allocfsent(struct mntent *fs)
                        quit("Cannot access %s\n", tabfs->mnt_fsname);
                if (tabbuf.st_rdev == buf.st_rdev) {
                        free(new);
+                       /* Copy passno and freq from /etc/fstab because 
+                        * /etc/mtab does always have them as 0 0 */
+                       if (!tabfs->mnt_passno)
+                               tabfs->mnt_passno = fs->mnt_passno;
+                       if (!tabfs->mnt_freq)
+                               tabfs->mnt_freq = fs->mnt_freq;
                        return NULL;
                }
        }
@@ -614,7 +620,7 @@ print_wmsg(char arg, int dumpme, const char *dev, int level,
                date = (char *)ctime(&ddate);
                d = strchr(date, '\n');
                if (d) *d = '\0';
-               printf("Level %c, Date %s\n", level, date);
+               printf("Level %d, Date %s\n", level, date);
        } else
                printf("never\n");
 }