107 lines
3.9 KiB
Diff
107 lines
3.9 KiB
Diff
|
From 0b996d3ebe95fdb6704f2c1d1a82574e07e86798 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Brian C. Lane" <bcl@redhat.com>
|
||
|
|
Date: Tue, 12 Apr 2016 16:13:44 -0700
|
||
|
|
Subject: [PATCH 32/36] parted: fix the rescue command
|
||
|
|
|
||
|
|
The rescue command often failed to locate a filesystem due to it
|
||
|
|
leaving cylinder alignment on, which snapped the allowed bounds
|
||
|
|
of the filesystem down to the next lower cylinder boundary,
|
||
|
|
causing the detected filesystem to be rejected due to not fitting.
|
||
|
|
|
||
|
|
(cherry picked from commit e09c30fb53179319ba1543813b5b4024e923b795)
|
||
|
|
---
|
||
|
|
parted/parted.c | 4 ++++
|
||
|
|
tests/Makefile.am | 1 +
|
||
|
|
tests/t1701-rescue-fs.sh | 52 ++++++++++++++++++++++++++++++++++++++++++++++++
|
||
|
|
3 files changed, 57 insertions(+)
|
||
|
|
create mode 100644 tests/t1701-rescue-fs.sh
|
||
|
|
|
||
|
|
diff --git a/parted/parted.c b/parted/parted.c
|
||
|
|
index f8c81ca..18b778c 100644
|
||
|
|
--- a/parted/parted.c
|
||
|
|
+++ b/parted/parted.c
|
||
|
|
@@ -1472,6 +1472,10 @@ do_rescue (PedDevice** dev, PedDisk** diskp)
|
||
|
|
disk = ped_disk_new (*dev);
|
||
|
|
if (!disk)
|
||
|
|
goto error;
|
||
|
|
+ if (ped_disk_is_flag_available(disk, PED_DISK_CYLINDER_ALIGNMENT))
|
||
|
|
+ if (!ped_disk_set_flag(disk, PED_DISK_CYLINDER_ALIGNMENT,
|
||
|
|
+ 0))
|
||
|
|
+ goto error;
|
||
|
|
|
||
|
|
if (!command_line_get_sector (_("Start?"), *dev, &start, NULL, NULL))
|
||
|
|
goto error_destroy_disk;
|
||
|
|
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||
|
|
index 001b9de..6a06dce 100644
|
||
|
|
--- a/tests/Makefile.am
|
||
|
|
+++ b/tests/Makefile.am
|
||
|
|
@@ -43,6 +43,7 @@ TESTS = \
|
||
|
|
t1102-loop-label.sh \
|
||
|
|
t1104-remove-and-add-partition.sh \
|
||
|
|
t1700-probe-fs.sh \
|
||
|
|
+ t1701-rescue-fs.sh \
|
||
|
|
t2200-dos-label-recog.sh \
|
||
|
|
t2201-pc98-label-recog.sh \
|
||
|
|
t2300-dos-label-extended-bootcode.sh \
|
||
|
|
diff --git a/tests/t1701-rescue-fs.sh b/tests/t1701-rescue-fs.sh
|
||
|
|
new file mode 100644
|
||
|
|
index 0000000..9b726cf
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/tests/t1701-rescue-fs.sh
|
||
|
|
@@ -0,0 +1,52 @@
|
||
|
|
+#!/bin/sh
|
||
|
|
+# rescue ext4 file system
|
||
|
|
+
|
||
|
|
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
|
||
|
|
+
|
||
|
|
+# This program is free software; you can redistribute it and/or modify
|
||
|
|
+# it under the terms of the GNU General Public License as published by
|
||
|
|
+# the Free Software Foundation; either version 3 of the License, or
|
||
|
|
+# (at your option) any later version.
|
||
|
|
+
|
||
|
|
+# This program is distributed in the hope that it will be useful,
|
||
|
|
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
|
|
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
|
|
+# GNU General Public License for more details.
|
||
|
|
+
|
||
|
|
+# You should have received a copy of the GNU General Public License
|
||
|
|
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||
|
|
+
|
||
|
|
+. "${srcdir=.}/init.sh"; path_prepend_ ../parted
|
||
|
|
+require_512_byte_sector_size_
|
||
|
|
+require_root_
|
||
|
|
+require_scsi_debug_module_
|
||
|
|
+
|
||
|
|
+# create memory-backed device
|
||
|
|
+scsi_debug_setup_ sector_size=$sector_size_ dev_size_mb=32 > dev-name ||
|
||
|
|
+ skip_ 'failed to create scsi_debug device'
|
||
|
|
+scsi_dev=$(cat dev-name)
|
||
|
|
+
|
||
|
|
+( mkfs.ext4 2>&1 | grep -i '^usage' ) > /dev/null \
|
||
|
|
+ || { warn_ "$ME: no ext4 support"; Exit $fail; }
|
||
|
|
+
|
||
|
|
+parted -s $scsi_dev mklabel msdos mkpart primary ext2 1m 100%
|
||
|
|
+mkfs.ext4 ${scsi_dev}1 || { warn_ $ME: mkfs.ext4 failed; fail=1; Exit $fail; }
|
||
|
|
+
|
||
|
|
+# remove the partition
|
||
|
|
+parted -s $scsi_dev rm 1 || fail=1
|
||
|
|
+
|
||
|
|
+# rescue the partition
|
||
|
|
+echo yes | parted ---pretend-input-tty $scsi_dev rescue 1m 100% > out 2>&1
|
||
|
|
+cat > exp <<EOF
|
||
|
|
+Information: A ext4 primary partition was found at 1049kB -> 33.6MB. Do you want to add it to the partition table?
|
||
|
|
+Yes/No/Cancel? yes
|
||
|
|
+Information: You may need to update /etc/fstab.
|
||
|
|
+EOF
|
||
|
|
+# Transform the actual output, to avoid spurious differences when
|
||
|
|
+# $PWD contains a symlink-to-dir. Also, remove the ^M ...^M bogosity.
|
||
|
|
+# normalize the actual output
|
||
|
|
+mv out o2 && sed -e "s,
*
,,g;s, $,," \
|
||
|
|
+ -e "s,^.*/lt-parted: ,parted: ," o2 > out
|
||
|
|
+echo '' >> exp
|
||
|
|
+compare out exp || fail=1
|
||
|
|
+Exit $fail
|
||
|
|
--
|
||
|
|
2.5.5
|
||
|
|
|