diff --git a/diskimage_builder/elements/growvols/static/usr/local/sbin/growvols b/diskimage_builder/elements/growvols/static/usr/local/sbin/growvols index c05cdc45a..497a17674 100755 --- a/diskimage_builder/elements/growvols/static/usr/local/sbin/growvols +++ b/diskimage_builder/elements/growvols/static/usr/local/sbin/growvols @@ -577,6 +577,8 @@ def main(argv): commands.append(Command([ 'pvcreate', + '-ff', + '--yes', dev_path ], 'Initialize %s for use by LVM' % devname)) diff --git a/diskimage_builder/elements/growvols/tests/test_growvols.py b/diskimage_builder/elements/growvols/tests/test_growvols.py index e411b6c64..794c800d2 100644 --- a/diskimage_builder/elements/growvols/tests/test_growvols.py +++ b/diskimage_builder/elements/growvols/tests/test_growvols.py @@ -726,7 +726,7 @@ class TestGrowvols(base.BaseTestCase): mock.call(['sgdisk', '--new=5:79267840:488265727', '--change-name=5:growvols', '/dev/sda']), mock.call(['partprobe']), - mock.call(['pvcreate', '/dev/sda5']), + mock.call(['pvcreate', '-ff', '--yes', '/dev/sda5']), mock.call(['vgextend', 'vg', '/dev/sda5']), mock.call(['lvextend', '--size', '+209404821504B', '/dev/mapper/vg-lv_root', '/dev/sda5']), @@ -757,7 +757,7 @@ class TestGrowvols(base.BaseTestCase): mock.call(['sgdisk', '--new=5:79267840:488265727', '--change-name=5:growvols', '/dev/sda']), mock.call(['partprobe']), - mock.call(['pvcreate', '/dev/sda5']), + mock.call(['pvcreate', '-ff', '--yes', '/dev/sda5']), mock.call(['vgextend', 'vg', '/dev/sda5']), mock.call(['lvextend', '--size', '+41880125440B', '/dev/mapper/vg-lv_home', '/dev/sda5']), @@ -828,7 +828,7 @@ class TestGrowvols(base.BaseTestCase): mock.call(['sgdisk', '--new=5:79267840:488265727', '--change-name=5:growvols', '/dev/sda']), mock.call(['partprobe']), - mock.call(['pvcreate', '/dev/sda5']), + mock.call(['pvcreate', '-ff', '--yes', '/dev/sda5']), mock.call(['vgextend', 'vg', '/dev/sda5']), mock.call(['lvextend', '--poolmetadatasize', '+1073741824B', 'vg/lv_thinpool']), @@ -877,7 +877,7 @@ class TestGrowvols(base.BaseTestCase): '--change-name=6:growvols', '/dev/dm-0']), mock.call(['multipath', '-r']), mock.call(['partprobe']), - mock.call(['pvcreate', '/dev/mapper/mpatha6']), + mock.call(['pvcreate', '-ff', '--yes', '/dev/mapper/mpatha6']), mock.call(['vgextend', 'vg', '/dev/mapper/mpatha6']), mock.call(['lvextend', '--poolmetadatasize', '+1073741824B', 'vg/lv_thinpool']),