db07609875
segfaults from bnc#710486 due to unchecked usage of return value of open_ctree() [fixed compilation warnings] - pull upstream, replace existing patches, spec update - update 'restore' utility - lzo support - tools may now take earlies superblock when opening the fs - other fixes - pull integration-20111030 branch - mkfs: force mkfs if desired - other fixes - add btrfs-dump-super to mkinitrd - other fixes - skip non-existent devices or without media - documentation updates - scrubbing single device - graceful error handling when opening fs fails - updated mkinitrd script to scan devices before mount (bnc#727383) OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=115
38 lines
1.0 KiB
Diff
38 lines
1.0 KiB
Diff
From a6aa706ee793b406761baeaa7cde78d1250f2d2b Mon Sep 17 00:00:00 2001
|
|
From: David Sterba <dsterba@suse.cz>
|
|
Date: Wed, 12 Oct 2011 13:36:13 +0200
|
|
Subject: [PATCH 01/35] btrfs-progs: ignore -a option in mkfs
|
|
|
|
Let mkfs accept '-a' option and not complain. When a partition has non-zero
|
|
value in the fs_passno filed in /etc/fstab, the fsck is run but fails and boot
|
|
stops. As fsck does not break things currently, it's safe to ignore the option
|
|
and let the boot proceed.
|
|
|
|
Reference: https://bugzilla.novell.com/show_bug.cgi?id=655906
|
|
|
|
Signed-off-by: David Sterba <dsterba@suse.cz>
|
|
---
|
|
btrfsck.c | 3 ++-
|
|
1 files changed, 2 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/btrfsck.c b/btrfsck.c
|
|
index 3a23e66..509ab72 100644
|
|
--- a/btrfsck.c
|
|
+++ b/btrfsck.c
|
|
@@ -2815,10 +2815,11 @@ int main(int ac, char **av)
|
|
|
|
while(1) {
|
|
int c;
|
|
- c = getopt(ac, av, "s:");
|
|
+ c = getopt(ac, av, "as:");
|
|
if (c < 0)
|
|
break;
|
|
switch(c) {
|
|
+ case 'a': /* ignored */ break;
|
|
case 's':
|
|
num = atol(optarg);
|
|
bytenr = btrfs_sb_offset(num);
|
|
--
|
|
1.7.6.233.gd79bc
|
|
|