Skip to content

Commit 631cdab

Browse files
committed
test: answer 2nd mdadm --create question for compat with new version
New version of mdadm now asks a second question, so send 'y' twice to it in the test scripts [ 5.253483] TEST-64-UDEV-STORAGE.sh[684]: + echo y [ 5.254412] TEST-64-UDEV-STORAGE.sh[685]: + mdadm --create /dev/md/mdmirror --name mdmirror --uuid aaaaaaaa:bbbbbbbb:cccccccc:00000001 /dev/disk/by-id/scsi-0systemd_foobar_deadbeefmdadm0 /dev/disk/by-id/scsi-0systemd_foobar_deadbeefmdadm1 -v -f --level=1 --raid-devices=2 [ 5.254759] TEST-64-UDEV-STORAGE.sh[685]: To optimalize recovery speed, it is recommended to enable write-indent bitmap, do you want to enable it now? [y/N]? mdadm: Note: this array has metadata at the start and [ 5.255085] TEST-64-UDEV-STORAGE.sh[685]: may not be suitable as a boot device. If you plan to [ 5.255418] TEST-64-UDEV-STORAGE.sh[685]: store '/boot' on this device please ensure that [ 5.255745] TEST-64-UDEV-STORAGE.sh[685]: your boot-loader understands md/v1.x metadata, or use [ 5.256285] TEST-64-UDEV-STORAGE.sh[685]: --metadata=0.90 [ 5.256672] TEST-64-UDEV-STORAGE.sh[685]: mdadm: size set to 64512K [ 5.257063] TEST-64-UDEV-STORAGE.sh[685]: Continue creating array [y/N]? mdadm: create aborted. This is backward compatible with the older version that asks just one question (cherry picked from commit 1640642) (cherry picked from commit b2320ce) (cherry picked from commit 8127259) (cherry picked from commit 133b50d) (cherry picked from commit e808cbd) (cherry picked from commit c75f0c6)
1 parent fdd95ce commit 631cdab

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

test/units/testsuite-64.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ testcase_mdadm_basic() {
832832
"/dev/disk/by-label/$part_name" # ext4 partition
833833
)
834834
# Create a simple RAID 1 with an ext4 filesystem
835-
echo y | mdadm --create "$raid_dev" --name "$raid_name" --uuid "$uuid" /dev/disk/by-id/ata-foobar_deadbeefmdadm{0..1} -v -f --level=1 --raid-devices=2
835+
printf 'y\ny\n' | mdadm --create "$raid_dev" --name "$raid_name" --uuid "$uuid" /dev/disk/by-id/ata-foobar_deadbeefmdadm{0..1} -v -f --level=1 --raid-devices=2
836836
udevadm wait --settle --timeout=30 "$raid_dev"
837837
mkfs.ext4 -L "$part_name" "$raid_dev"
838838
udevadm wait --settle --timeout=30 "${expected_symlinks[@]}"
@@ -861,7 +861,7 @@ testcase_mdadm_basic() {
861861
"/dev/disk/by-label/$part_name" # ext4 partition
862862
)
863863
# Create a simple RAID 5 with an ext4 filesystem
864-
echo y | mdadm --create "$raid_dev" --name "$raid_name" --uuid "$uuid" /dev/disk/by-id/ata-foobar_deadbeefmdadm{0..2} -v -f --level=5 --raid-devices=3
864+
printf 'y\ny\n' | mdadm --create "$raid_dev" --name "$raid_name" --uuid "$uuid" /dev/disk/by-id/ata-foobar_deadbeefmdadm{0..2} -v -f --level=5 --raid-devices=3
865865
udevadm wait --settle --timeout=30 "$raid_dev"
866866
mkfs.ext4 -L "$part_name" "$raid_dev"
867867
udevadm wait --settle --timeout=30 "${expected_symlinks[@]}"
@@ -901,7 +901,7 @@ testcase_mdadm_basic() {
901901
"/dev/disk/by-id/md-uuid-$uuid-part3"
902902
)
903903
# Create a simple RAID 10 with an ext4 filesystem
904-
echo y | mdadm --create "$raid_dev" --name "$raid_name" --uuid "$uuid" /dev/disk/by-id/ata-foobar_deadbeefmdadm{0..3} -v -f --level=10 --raid-devices=4
904+
printf 'y\ny\n' | mdadm --create "$raid_dev" --name "$raid_name" --uuid "$uuid" /dev/disk/by-id/ata-foobar_deadbeefmdadm{0..3} -v -f --level=10 --raid-devices=4
905905
udevadm wait --settle --timeout=30 "$raid_dev"
906906
# Partition the raid device
907907
# Here, 'udevadm lock' is meaningless, as udevd does not lock MD devices.
@@ -954,7 +954,7 @@ testcase_mdadm_lvm() {
954954
"/dev/disk/by-label/$part_name" # ext4 partition
955955
)
956956
# Create a RAID 10 with LVM + ext4
957-
echo y | mdadm --create "$raid_dev" --name "$raid_name" --uuid "$uuid" /dev/disk/by-id/ata-foobar_deadbeefmdadmlvm{0..3} -v -f --level=10 --raid-devices=4
957+
printf 'y\ny\n' | mdadm --create "$raid_dev" --name "$raid_name" --uuid "$uuid" /dev/disk/by-id/ata-foobar_deadbeefmdadmlvm{0..3} -v -f --level=10 --raid-devices=4
958958
udevadm wait --settle --timeout=30 "$raid_dev"
959959
# Create an LVM on the MD
960960
lvm pvcreate -y "$raid_dev"

0 commit comments

Comments
 (0)