Skip to content

Commit d85a2af

Browse files
committed
resize/test-virt-resize.pl: Parameterize shrink and expand sizes
When shrinking or expanding the partition, we previously hard-coded 512M -> 260M for shrinking and 512M -> 800M for expanding. Parameterize these instead. Refactoring only.
1 parent be13265 commit d85a2af

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

resize/test-virt-resize.pl

+16-8
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@
6767
my $part_size_mb = 512;
6868
my $part_size_sectors = 1024 * 1024 * $part_size_mb / 512;
6969

70+
my $expand_target_size_mb = 800;
71+
my $shrink_target_size_mb = 260;
72+
7073
# Create the handle.
7174
my $g = Sys::Guestfs->new ();
7275
my $backend = $g->get_backend ();
@@ -258,22 +261,27 @@
258261
# do nothing - it's the extended partition
259262
} elsif ($content eq "lvm") {
260263
$g->pvcreate ($dev);
261-
# If shrinking, shrink the PV to < 260MB.
264+
# If shrinking, shrink the PV to < shrink size.
262265
if (!$expand) {
263-
$g->pvresize_size ($dev, 256 * 1024 * 1024);
266+
$g->pvresize_size ($dev, ($shrink_target_size_mb-4) * 1024 * 1024);
264267
}
265268
} else {
266269
$g->mkfs ($content, $dev);
267-
# If shrinking, shrink the filesystem to < 260MB.
270+
# If shrinking, shrink the filesystem to < shrink size.
268271
if (!$expand) {
269272
if ($content eq "ext2") {
270-
$g->resize2fs_size ($dev, 256 * 1024 * 1024);
273+
$g->resize2fs_size ($dev,
274+
($shrink_target_size_mb-4) * 1024 * 1024);
271275
} elsif ($content eq "btrfs") {
272276
$g->mount ($dev, "/");
273-
$g->btrfs_filesystem_resize ("/", size => 256 * 1024 * 1024);
277+
$g->btrfs_filesystem_resize
278+
("/",
279+
size => ($shrink_target_size_mb-4) * 1024 * 1024);
274280
$g->umount_all ();
275281
} elsif ($content eq "ntfs") {
276-
$g->ntfsresize ($dev, size => 256 * 1024 * 1024);
282+
$g->ntfsresize
283+
($dev,
284+
size => ($shrink_target_size_mb-4) * 1024 * 1024);
277285
} else {
278286
die "internal error: content = $content";
279287
}
@@ -299,9 +307,9 @@
299307
for ($i = 1; $i <= $nr_parts; ++$i) {
300308
if ($parts[$i]->{resize} || $parts[$i]->{expand_shrink}) {
301309
if ($expand) {
302-
$target_size += 800;
310+
$target_size += $expand_target_size_mb;
303311
} else {
304-
$target_size += 260;
312+
$target_size += $shrink_target_size_mb;
305313
}
306314
} else {
307315
$target_size += $part_size_mb; # remain at original size

0 commit comments

Comments
 (0)