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

Proposed by Surbhi Palande
Status: Rejected
Rejected by: Martin Pitt
Proposed branch: lp:~csurbhi/ubuntu/maverick/mountall/mountall.fix-460246
Merge into: lp:ubuntu/maverick/mountall
Diff against target: 51 lines (+20/-11)
2 files modified
debian/changelog (+7/-0)
src/mountall.c (+13/-11)
To merge this branch: bzr merge lp:~csurbhi/ubuntu/maverick/mountall/mountall.fix-460246
Reviewer Review Type Date Requested Status
Martin Pitt Disapprove
Artur Rona (community) Needs Fixing
Review via email: mp+32785@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Artur Rona (ari-tczew) wrote :

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

review: Needs Fixing
Revision history for this message
Martin Pitt (pitti) wrote :

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

review: Approve
Revision history for this message
Martin Pitt (pitti) wrote :

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

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-07-22 15:13:09 +0000
3+++ debian/changelog 2010-08-16 16:42:41 +0000
4@@ -1,3 +1,10 @@
5+mountall (2.15ubuntu2) UNRELEASED; urgency=low
6+
7+ * btrfsck does not accept any switch as of now. So avoid using any switches
8+ like -a/-C<fd>/-f to btrfsck till these are implemented. (LP: #460246)
9+
10+ -- Surbhi Palande <surbhi.palande@canonical.com> Mon, 16 Aug 2010 19:24:22 +0300
11+
12 mountall (2.15) UNRELEASED; urgency=low
13
14 [ Scott James Remnant ]
15
16=== modified file 'src/mountall.c'
17--- src/mountall.c 2010-05-08 11:53:50 +0000
18+++ src/mountall.c 2010-08-16 16:42:41 +0000
19@@ -1999,19 +1999,21 @@
20
21 args = NIH_MUST (nih_str_array_new (NULL));
22 NIH_MUST (nih_str_array_add (&args, NULL, &args_len, "fsck"));
23- if (fsck_fix || mnt->fsck_fix) {
24- NIH_MUST (nih_str_array_add (&args, NULL, &args_len, "-y"));
25- } else {
26- NIH_MUST (nih_str_array_add (&args, NULL, &args_len, "-a"));
27- }
28- if (fds[1] >= 0) {
29- nih_local char *arg = NULL;
30+ if(strcmp (mnt->type, "btrfs") != 0) {
31+ if (fsck_fix || mnt->fsck_fix) {
32+ NIH_MUST (nih_str_array_add (&args, NULL, &args_len, "-y"));
33+ } else {
34+ NIH_MUST (nih_str_array_add (&args, NULL, &args_len, "-a"));
35+ }
36+ if (fds[1] >= 0) {
37+ nih_local char *arg = NULL;
38
39- arg = NIH_MUST (nih_sprintf (NULL, "-C%d", fds[1]));
40- NIH_MUST (nih_str_array_addp (&args, NULL, &args_len, arg));
41+ arg = NIH_MUST (nih_sprintf (NULL, "-C%d", fds[1]));
42+ NIH_MUST (nih_str_array_addp (&args, NULL, &args_len, arg));
43+ }
44+ if (force_fsck)
45+ NIH_MUST (nih_str_array_add (&args, NULL, &args_len, "-f"));
46 }
47- if (force_fsck)
48- NIH_MUST (nih_str_array_add (&args, NULL, &args_len, "-f"));
49 NIH_MUST (nih_str_array_add (&args, NULL, &args_len, "-t"));
50 NIH_MUST (nih_str_array_add (&args, NULL, &args_len, mnt->type));
51 NIH_MUST (nih_str_array_add (&args, NULL, &args_len, mnt->device));

Subscribers

People subscribed via source and target branches