From 88785a6d83f4096f9d9e1581ec56bcac5a5d6e28 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 18 Jun 2010 10:21:24 +0000 Subject: [PATCH] errors=remount-ro doesn't work. Remove it. r63493 --- TODO | 1 - debian/changelog | 6 ++++++ fstab.d/btrfs | 5 ----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TODO b/TODO index 1db6a1e..f5bf478 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,6 @@ * Support for multi-volume btrfs filesystems * Support for other mkfs.btrfs options, if any are useful. * Support for btrfs snapshots / using existing btrfs? -* Check if errors=remount-ro makes sense to use. * mountoptions is missing a few options that may be worth supporting, including degraded, and all optionds that require a parameter. * mountoptions contains nobarrier, which is an unsafe option. Remove? Warn? diff --git a/debian/changelog b/debian/changelog index 22b3267..b0c4905 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +partman-btrfs (2) UNRELEASED; urgency=low + + * errors=remount-ro doesn't work. Remove it. + + -- Colin Watson Fri, 18 Jun 2010 11:20:14 +0100 + partman-btrfs (1) unstable; urgency=low [ Joey Hess ] diff --git a/fstab.d/btrfs b/fstab.d/btrfs index 9111d3b..9327e5a 100755 --- a/fstab.d/btrfs +++ b/fstab.d/btrfs @@ -22,11 +22,6 @@ for dev in $DEVICES/*; do fi options=$(get_mountoptions $dev $id) if [ "$mountpoint" = / ]; then - if [ "$options" = defaults ]; then - options="errors=remount-ro" - else - options="${options},errors=remount-ro" - fi pass=1 else pass=2