diff options
37 files changed, 13 insertions, 78 deletions
diff --git a/tests/expected/sfdisk/dos-resize b/tests/expected/sfdisk/dos-resize index 3ce02ec46..b721816a4 100644 --- a/tests/expected/sfdisk/dos-resize +++ b/tests/expected/sfdisk/dos-resize @@ -1,5 +1,3 @@ -Checking that no-one is using this disk right now ... OK - Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes diff --git a/tests/expected/sfdisk/gpt-resize b/tests/expected/sfdisk/gpt-resize index dbe41ba61..f4f17c73b 100644 --- a/tests/expected/sfdisk/gpt-resize +++ b/tests/expected/sfdisk/gpt-resize @@ -1,5 +1,3 @@ -Checking that no-one is using this disk right now ... OK - Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes diff --git a/tests/expected/sfdisk/movedata-down b/tests/expected/sfdisk/movedata-down index 227cf8cbc..6b5339801 100644 --- a/tests/expected/sfdisk/movedata-down +++ b/tests/expected/sfdisk/movedata-down @@ -1,5 +1,3 @@ -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/movedata-non-overlay b/tests/expected/sfdisk/movedata-non-overlay index 6a07831b9..0a4d525ae 100644 --- a/tests/expected/sfdisk/movedata-non-overlay +++ b/tests/expected/sfdisk/movedata-non-overlay @@ -1,5 +1,3 @@ -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/movedata-up b/tests/expected/sfdisk/movedata-up index e68d33bf2..14f2122f3 100644 --- a/tests/expected/sfdisk/movedata-up +++ b/tests/expected/sfdisk/movedata-up @@ -1,5 +1,3 @@ -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-dos-0-move-up-absolute b/tests/expected/sfdisk/resize-dos-0-move-up-absolute index 14d1a7656..6fb298f76 100644 --- a/tests/expected/sfdisk/resize-dos-0-move-up-absolute +++ b/tests/expected/sfdisk/resize-dos-0-move-up-absolute @@ -1,7 +1,5 @@ 3000, -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-dos-1-move-down-absolute b/tests/expected/sfdisk/resize-dos-1-move-down-absolute index feaa2b2e6..9db9e6e43 100644 --- a/tests/expected/sfdisk/resize-dos-1-move-down-absolute +++ b/tests/expected/sfdisk/resize-dos-1-move-down-absolute @@ -1,7 +1,5 @@ 2048, -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-dos-10-down-enlarge b/tests/expected/sfdisk/resize-dos-10-down-enlarge index 83eb2d8e8..bd8d4c725 100644 --- a/tests/expected/sfdisk/resize-dos-10-down-enlarge +++ b/tests/expected/sfdisk/resize-dos-10-down-enlarge @@ -1,7 +1,5 @@ -10M,+10M,,* -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-dos-11-absolute-move-resize b/tests/expected/sfdisk/resize-dos-11-absolute-move-resize index eef18a0d2..fabcd7059 100644 --- a/tests/expected/sfdisk/resize-dos-11-absolute-move-resize +++ b/tests/expected/sfdisk/resize-dos-11-absolute-move-resize @@ -1,7 +1,5 @@ 2048,10M,L -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-dos-12-reduce-midle b/tests/expected/sfdisk/resize-dos-12-reduce-midle index eaea4eb9a..a992a8078 100644 --- a/tests/expected/sfdisk/resize-dos-12-reduce-midle +++ b/tests/expected/sfdisk/resize-dos-12-reduce-midle @@ -1,7 +1,5 @@ ,-5M -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-dos-13-max-last b/tests/expected/sfdisk/resize-dos-13-max-last index af514ac4e..1680de77c 100644 --- a/tests/expected/sfdisk/resize-dos-13-max-last +++ b/tests/expected/sfdisk/resize-dos-13-max-last @@ -1,7 +1,5 @@ -5M,+ -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-dos-2-move-up-relative b/tests/expected/sfdisk/resize-dos-2-move-up-relative index 50cc67de7..dde3c7fd2 100644 --- a/tests/expected/sfdisk/resize-dos-2-move-up-relative +++ b/tests/expected/sfdisk/resize-dos-2-move-up-relative @@ -1,7 +1,5 @@ +1M, -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-dos-3-move-down-relative b/tests/expected/sfdisk/resize-dos-3-move-down-relative index ec51a1257..b4db47840 100644 --- a/tests/expected/sfdisk/resize-dos-3-move-down-relative +++ b/tests/expected/sfdisk/resize-dos-3-move-down-relative @@ -1,7 +1,5 @@ -1M, -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-dos-4-enlarge-absolute b/tests/expected/sfdisk/resize-dos-4-enlarge-absolute index c3ce8b776..600606850 100644 --- a/tests/expected/sfdisk/resize-dos-4-enlarge-absolute +++ b/tests/expected/sfdisk/resize-dos-4-enlarge-absolute @@ -1,7 +1,5 @@ -,15M -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-dos-5-reduce-absolute b/tests/expected/sfdisk/resize-dos-5-reduce-absolute index 0ee2b075c..b11f63543 100644 --- a/tests/expected/sfdisk/resize-dos-5-reduce-absolute +++ b/tests/expected/sfdisk/resize-dos-5-reduce-absolute @@ -1,7 +1,5 @@ ,5M, -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-dos-6-enlarge-relative b/tests/expected/sfdisk/resize-dos-6-enlarge-relative index 312945dec..681bb93cb 100644 --- a/tests/expected/sfdisk/resize-dos-6-enlarge-relative +++ b/tests/expected/sfdisk/resize-dos-6-enlarge-relative @@ -1,7 +1,5 @@ , +10M -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-dos-7-reduce-relative b/tests/expected/sfdisk/resize-dos-7-reduce-relative index f01e2a920..c2ab970bc 100644 --- a/tests/expected/sfdisk/resize-dos-7-reduce-relative +++ b/tests/expected/sfdisk/resize-dos-7-reduce-relative @@ -1,7 +1,5 @@ , -10M -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-dos-8-enlarge-all b/tests/expected/sfdisk/resize-dos-8-enlarge-all index 829dfd497..f577aff33 100644 --- a/tests/expected/sfdisk/resize-dos-8-enlarge-all +++ b/tests/expected/sfdisk/resize-dos-8-enlarge-all @@ -1,7 +1,5 @@ ,+ -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-dos-9-up-preduce b/tests/expected/sfdisk/resize-dos-9-up-preduce index a1119f147..829c98dba 100644 --- a/tests/expected/sfdisk/resize-dos-9-up-preduce +++ b/tests/expected/sfdisk/resize-dos-9-up-preduce @@ -1,7 +1,5 @@ +10M,-10M -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-gpt-0-move-up-absolute b/tests/expected/sfdisk/resize-gpt-0-move-up-absolute index 2f8478759..d337dbd54 100644 --- a/tests/expected/sfdisk/resize-gpt-0-move-up-absolute +++ b/tests/expected/sfdisk/resize-gpt-0-move-up-absolute @@ -1,7 +1,5 @@ 3000, -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-gpt-1-move-down-absolute b/tests/expected/sfdisk/resize-gpt-1-move-down-absolute index ad28d6fdd..16233f73f 100644 --- a/tests/expected/sfdisk/resize-gpt-1-move-down-absolute +++ b/tests/expected/sfdisk/resize-gpt-1-move-down-absolute @@ -1,7 +1,5 @@ 2048, -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-gpt-10-down-enlarge b/tests/expected/sfdisk/resize-gpt-10-down-enlarge index 44b1fb7b7..f2ed7fb5b 100644 --- a/tests/expected/sfdisk/resize-gpt-10-down-enlarge +++ b/tests/expected/sfdisk/resize-gpt-10-down-enlarge @@ -1,7 +1,5 @@ -10M,+10M,,* -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize b/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize index c4dd0cbce..bfa3d07d2 100644 --- a/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize +++ b/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize @@ -1,7 +1,5 @@ 2048,10M,L -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-gpt-12-reduce-midle b/tests/expected/sfdisk/resize-gpt-12-reduce-midle index fad398e8a..aad0a6a28 100644 --- a/tests/expected/sfdisk/resize-gpt-12-reduce-midle +++ b/tests/expected/sfdisk/resize-gpt-12-reduce-midle @@ -1,7 +1,5 @@ ,-5M -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-gpt-13-max-last b/tests/expected/sfdisk/resize-gpt-13-max-last index bcbe729b6..b08a6fc93 100644 --- a/tests/expected/sfdisk/resize-gpt-13-max-last +++ b/tests/expected/sfdisk/resize-gpt-13-max-last @@ -1,7 +1,5 @@ -5M,+ -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-gpt-2-move-up-relative b/tests/expected/sfdisk/resize-gpt-2-move-up-relative index deaf77744..18c685ca0 100644 --- a/tests/expected/sfdisk/resize-gpt-2-move-up-relative +++ b/tests/expected/sfdisk/resize-gpt-2-move-up-relative @@ -1,7 +1,5 @@ +1M, -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-gpt-3-move-down-relative b/tests/expected/sfdisk/resize-gpt-3-move-down-relative index eb7b80b64..18252824d 100644 --- a/tests/expected/sfdisk/resize-gpt-3-move-down-relative +++ b/tests/expected/sfdisk/resize-gpt-3-move-down-relative @@ -1,7 +1,5 @@ -1M, -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute b/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute index 2a7843e33..1cae0cdb8 100644 --- a/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute +++ b/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute @@ -1,7 +1,5 @@ -,15M -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-gpt-5-reduce-absolute b/tests/expected/sfdisk/resize-gpt-5-reduce-absolute index 453f1fe30..3e5d33a2b 100644 --- a/tests/expected/sfdisk/resize-gpt-5-reduce-absolute +++ b/tests/expected/sfdisk/resize-gpt-5-reduce-absolute @@ -1,7 +1,5 @@ ,5M, -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-gpt-6-enlarge-relative b/tests/expected/sfdisk/resize-gpt-6-enlarge-relative index 064f74d12..8cea323f9 100644 --- a/tests/expected/sfdisk/resize-gpt-6-enlarge-relative +++ b/tests/expected/sfdisk/resize-gpt-6-enlarge-relative @@ -1,7 +1,5 @@ , +10M -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-gpt-7-reduce-relative b/tests/expected/sfdisk/resize-gpt-7-reduce-relative index 8bb65f15c..5b8fd43e4 100644 --- a/tests/expected/sfdisk/resize-gpt-7-reduce-relative +++ b/tests/expected/sfdisk/resize-gpt-7-reduce-relative @@ -1,7 +1,5 @@ , -10M -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-gpt-8-enlarge-all b/tests/expected/sfdisk/resize-gpt-8-enlarge-all index 85a5c701a..89bbe8395 100644 --- a/tests/expected/sfdisk/resize-gpt-8-enlarge-all +++ b/tests/expected/sfdisk/resize-gpt-8-enlarge-all @@ -1,7 +1,5 @@ ,+ -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/sfdisk/resize-gpt-9-up-preduce b/tests/expected/sfdisk/resize-gpt-9-up-preduce index 741f172fb..bf0faa571 100644 --- a/tests/expected/sfdisk/resize-gpt-9-up-preduce +++ b/tests/expected/sfdisk/resize-gpt-9-up-preduce @@ -1,7 +1,5 @@ +10M,-10M -Checking that no-one is using this disk right now ... OK - Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/ts/sfdisk/dos b/tests/ts/sfdisk/dos index dbcccf9cb..592d6e411 100755 --- a/tests/ts/sfdisk/dos +++ b/tests/ts/sfdisk/dos @@ -126,7 +126,7 @@ label: dos ,10M,S,* EOF udevadm settle -echo ',+' | $TS_CMD_SFDISK -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo ',+' | $TS_CMD_SFDISK --no-reread -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest diff --git a/tests/ts/sfdisk/gpt b/tests/ts/sfdisk/gpt index 2c3d5ccc6..4f802de58 100755 --- a/tests/ts/sfdisk/gpt +++ b/tests/ts/sfdisk/gpt @@ -129,7 +129,7 @@ label: gpt ,10M,S,* EOF udevadm settle -echo ',+' | $TS_CMD_SFDISK -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo ',+' | $TS_CMD_SFDISK --no-reread -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest @@ -149,6 +149,7 @@ ${TS_DEVICE}3 : start=20480, size=81887 ${TS_DEVICE}4 : start=14336, size=6144 EOF udevadm settle +# why --reorder does not re-read? $TS_CMD_SFDISK --reorder ${TS_DEVICE} >> $TS_OUTPUT 2>&1 $TS_CMD_SFDISK --list ${TS_DEVICE} >> $TS_OUTPUT 2>&1 ts_fdisk_clean $TS_DEVICE diff --git a/tests/ts/sfdisk/movedata b/tests/ts/sfdisk/movedata index b4b953755..d37f72a4f 100755 --- a/tests/ts/sfdisk/movedata +++ b/tests/ts/sfdisk/movedata @@ -30,7 +30,7 @@ ts_check_prog "mkfs.ext4" ts_scsi_debug_init dev_size_mb=100 sector_size=512 # create a partition -echo ',10M,L' | $TS_CMD_SFDISK ${TS_DEVICE} &> /dev/null +echo ',10M,L' | $TS_CMD_SFDISK --no-reread ${TS_DEVICE} &> /dev/null udevadm settle mkfs.ext4 ${TS_DEVICE}1 &> /dev/null @@ -46,7 +46,7 @@ function checksum() { } ts_init_subtest "up" -echo '+1000,' | $TS_CMD_SFDISK --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo '+1000,' | $TS_CMD_SFDISK --no-reread --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 ts_fdisk_clean $TS_DEVICE udevadm settle checksum ${TS_DEVICE}1 @@ -55,7 +55,7 @@ ts_finalize_subtest udevadm settle ts_init_subtest "down" -echo "-500," | $TS_CMD_SFDISK --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo "-500," | $TS_CMD_SFDISK --no-reread --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 ts_fdisk_clean $TS_DEVICE udevadm settle checksum ${TS_DEVICE}1 @@ -64,7 +64,7 @@ ts_finalize_subtest udevadm settle ts_init_subtest "non-overlay" -echo "+30M," | $TS_CMD_SFDISK --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo "+30M," | $TS_CMD_SFDISK --no-reread --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 ts_fdisk_clean $TS_DEVICE udevadm settle checksum ${TS_DEVICE}1 diff --git a/tests/ts/sfdisk/resize b/tests/ts/sfdisk/resize index c5f80f980..8bc3484da 100755 --- a/tests/ts/sfdisk/resize +++ b/tests/ts/sfdisk/resize @@ -75,7 +75,7 @@ function test_label_resize { udevadm settle # create a partition - echo ',10M,L' | $TS_CMD_SFDISK --label ${label} ${TS_DEVICE} &> /dev/null + echo ',10M,L' | $TS_CMD_SFDISK --no-reread --label ${label} ${TS_DEVICE} &> /dev/null udevadm settle for idx in $(seq 0 $(( ${#COMM[*]} - 1 ))); do @@ -85,23 +85,23 @@ function test_label_resize { ts_init_subtest "$label-$idx-$name" echo -e "$cmd\n" >> $TS_OUTPUT - echo "$cmd" | $TS_CMD_SFDISK -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 + echo "$cmd" | $TS_CMD_SFDISK --no-reread -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest done - echo ',10M,L' | $TS_CMD_SFDISK --append ${TS_DEVICE} &> /dev/null + echo ',10M,L' | $TS_CMD_SFDISK --no-reread --append ${TS_DEVICE} &> /dev/null udevadm settle - echo ',10M,L' | $TS_CMD_SFDISK --append ${TS_DEVICE} &> /dev/null + echo ',10M,L' | $TS_CMD_SFDISK --no-reread --append ${TS_DEVICE} &> /dev/null udevadm settle idx=$(( $idx + 1 )) ts_init_subtest "$label-$idx-reduce-midle" cmd=',-5M' echo -e "$cmd\n" >> $TS_OUTPUT - echo "$cmd" | $TS_CMD_SFDISK -N2 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 + echo "$cmd" | $TS_CMD_SFDISK --no-reread -N2 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest @@ -110,7 +110,7 @@ function test_label_resize { ts_init_subtest "$label-$idx-max-last" cmd='-5M,+' echo -e "$cmd\n" >> $TS_OUTPUT - echo $cmd | $TS_CMD_SFDISK -N3 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 + echo $cmd | $TS_CMD_SFDISK --no-reread -N3 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest |