Bug#336585: yaird: The fs_freq and fs_passno fields in /etc/fstab are optional

[Erik van Konijnenburg <ekonijn@xs4all.nl>]

On Mon, Oct 31, 2005 at 11:22:23AM +0000, Ian Campbell wrote:
> Package: yaird
> Version: 0.0.11-10
> Severity: normal
> 
> When running yaird I get the following:
>   $ sudo /usr/sbin/yaird --output /tmp/initrd 2.6.14-1-386
>   yaird error: malformed line in /etc/fstab:14 (fatal)
> this also effects the linux-image-2.6.14-1-386 package.
> 
> The problem is that I have several entries in fstab without the optional
> fifth and sixth fields (fs_freq and fs_passno). The comments around line
> 49 of /usr/lib/yaird/perl/FsTab.pm suggest that the author was aware
> that these were optional fields but I thought a bug report was
> appropriate to stop the problem falling through the cracks.

Attached patch should fix this;
note that 336612, 336636 336585 seem to be dups.

Regards,
Erik

diff -urN -x {arch} -x .arch-ids -x configure -x aclocal.m4 -x depcomp -x missing -x Makefile -x Makefile.in -x install-sh -x INSTALL p77/ChangeLog p78/ChangeLog
--- p77/ChangeLog	2005-10-31 20:59:00.000000000 +0100
+++ p78/ChangeLog	2005-10-31 20:59:07.000000000 +0100
@@ -2,6 +2,23 @@
 # arch-tag: automatic-ChangeLog--ekonijn@xs4all.nl--debian/yaird--devo--0.1
 #
 
+2005-10-31 19:58:18 GMT	Erik van Konijnenburg <ekonijn@xs4all.nl>	patch-78
+
+    Summary:
+      0.0.12 pre
+    Revision:
+      yaird--devo--0.1--patch-78
+
+        * The last two fields on fstab line are optional
+          in the mount command, so let's have them optional
+          in yaird as well.
+          This should fix debian bugs 336612, 336636 336585
+          
+
+    modified files:
+     ChangeLog perl/FsTab.pm
+
+
 2005-10-31 19:30:17 GMT	Erik van Konijnenburg <ekonijn@xs4all.nl>	patch-77
 
     Summary:
diff -urN -x {arch} -x .arch-ids -x configure -x aclocal.m4 -x depcomp -x missing -x Makefile -x Makefile.in -x install-sh -x INSTALL p77/perl/FsTab.pm p78/perl/FsTab.pm
--- p77/perl/FsTab.pm	2005-10-31 20:59:00.000000000 +0100
+++ p78/perl/FsTab.pm	2005-10-31 20:59:07.000000000 +0100
@@ -45,9 +45,10 @@
 		next if $line =~ /^#/;	# comment line
 		next if $line eq "";	# empty line
 		my @fields = split (/\s+/, $line, 999);
-		if ($#fields < 6) {
+		if ($#fields < 4) {
 			# no test for extra fields;
 			# the mount command allows that.
+			# note that field 5,6 (fsck stuff) is optional
 			Base::fatal ("malformed line in $name:$lineNo");
 		}
 		if ($fields[2] eq "swap") {