Merge lp:~csurbhi/ubuntu/maverick/mountall/mountall.fix-460246 into lp:ubuntu/maverick/mountall

[Surbhi Palande]

btrfsck does not accept any switches like -A/-f/-y/-C<fd> as of now. So till these switches are implemented in btrfsck avoid invoking "fsck -t btrfs" with them.

Please do consider merging this for maverick.

[Artur Rona (ari-tczew)]

Surbhi thanks for the patch. Could you update patch for latest package 2.19?

review: Needs Fixing

[Martin Pitt (pitti)]

The changes still apply cleanly, and natty's btrfsck still doesn't take any switches, so this still applies.

review: Approve

[Martin Pitt (pitti)]

On second sight, I think we should rather fix btrfsck itself to ignore arguments for now, as proposed in the Debian bug report.

review: Disapprove

Unmerged revisions

335. By Surbhi Palande on 2010-08-16

btrfsck does not accept any switch as of now. So avoid using any switches
like -a/-C<fd>/-f to btrfsck till these are implemented. (LP: #460246)

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-22 15:13:09 +0000
+++ debian/changelog	2010-08-16 16:42:41 +0000
@@ -1,3 +1,10 @@
+mountall (2.15ubuntu2) UNRELEASED; urgency=low
+
+  * btrfsck does not accept any switch as of now. So avoid using any switches
+    like -a/-C<fd>/-f to btrfsck till these are implemented. (LP: #460246)
+
+ -- Surbhi Palande <[e-mail]>  Mon, 16 Aug 2010 19:24:22 +0300
+
 mountall (2.15) UNRELEASED; urgency=low
 
   [ Scott James Remnant ]
 
=== modified file 'src/mountall.c'
--- src/mountall.c	2010-05-08 11:53:50 +0000
+++ src/mountall.c	2010-08-16 16:42:41 +0000
@@ -1999,19 +1999,21 @@
 
 	args = NIH_MUST (nih_str_array_new (NULL));
 	NIH_MUST (nih_str_array_add (&args, NULL, &args_len, "fsck"));
-	if (fsck_fix || mnt->fsck_fix) {
-		NIH_MUST (nih_str_array_add (&args, NULL, &args_len, "-y"));
-	} else {
-		NIH_MUST (nih_str_array_add (&args, NULL, &args_len, "-a"));
-	}
-	if (fds[1] >= 0) {
-		nih_local char *arg = NULL;
+	if(strcmp (mnt->type, "btrfs") != 0) {
+		if (fsck_fix || mnt->fsck_fix) {
+			NIH_MUST (nih_str_array_add (&args, NULL, &args_len, "-y"));
+		} else {
+			NIH_MUST (nih_str_array_add (&args, NULL, &args_len, "-a"));
+		}
+		if (fds[1] >= 0) {
+			nih_local char *arg = NULL;
 
-		arg = NIH_MUST (nih_sprintf (NULL, "-C%d", fds[1]));
-		NIH_MUST (nih_str_array_addp (&args, NULL, &args_len, arg));
+			arg = NIH_MUST (nih_sprintf (NULL, "-C%d", fds[1]));
+			NIH_MUST (nih_str_array_addp (&args, NULL, &args_len, arg));
+		}
+		if (force_fsck)
+			NIH_MUST (nih_str_array_add (&args, NULL, &args_len, "-f"));
 	}
-	if (force_fsck)
-		NIH_MUST (nih_str_array_add (&args, NULL, &args_len, "-f"));
 	NIH_MUST (nih_str_array_add (&args, NULL, &args_len, "-t"));
 	NIH_MUST (nih_str_array_add (&args, NULL, &args_len, mnt->type));
 	NIH_MUST (nih_str_array_add (&args, NULL, &args_len, mnt->device));