Merge ~dbungert/curtin:ntfsresize-force into curtin:master

[Dan Bungert]

block: ntfsresize with force options

To match Ubiquity behavior, we should run ntfsresize with the force
options and sending 'y\n' on input.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:88d9910679be752715752687844c1b98e45e4808
https://jenkins.canonical.com/server-team/job/curtin-ci/93/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-amd64/93/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-arm64/93/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-ppc64el/93/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-s390x/93/

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/curtin-ci/93//rebuild

review: Approve (continuous-integration)

[Dimitri John Ledkov (xnox)]

i hate it.
ship it.

review: Approve (prejudice)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:6caa799551b19dc85cb1e901e013b12be326aff1
https://jenkins.canonical.com/server-team/job/curtin-ci/94/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-amd64/94/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-arm64/94/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-ppc64el/94/
    SUCCESS: https://jenkins.canonical.com/server-team/job/curtin-ci/nodes=metal-s390x/94/

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/curtin-ci/94//rebuild

review: Approve (continuous-integration)

diff --git a/curtin/commands/block_meta_v2.py b/curtin/commands/block_meta_v2.py
index 552ab98..79dfd39 100644
--- a/curtin/commands/block_meta_v2.py
+++ b/curtin/commands/block_meta_v2.py
@@ -85,7 +85,9 @@ def resize_ext(path, size):
 
 
 def resize_ntfs(path, size):
-    util.subp(['ntfsresize', '-s', str(size), path])
+    util.subp(['ntfsresize', '-f', '-s', str(size), path],
+              data=b'y\n',
+              capture=True)
 
 
 def perform_resize(kname, resize):
diff --git a/tests/integration/test_block_meta.py b/tests/integration/test_block_meta.py
index d7c52d8..b25d2ce 100644
--- a/tests/integration/test_block_meta.py
+++ b/tests/integration/test_block_meta.py
@@ -631,6 +631,33 @@ class TestBlockMeta(IntegrationTestCase):
                 ])
             self.check_fssize(dev, p1, fstype, end)
 
+    def test_multi_resize(self):
+        img = self.tmp_path('image.img')
+        config = StorageConfigBuilder(version=2)
+        config.add_image(path=img, size='200M', ptable='gpt')
+
+        def size_to(size):
+            p1['size'] = size
+            self.run_bm(config.render())
+            with loop_dev(img) as dev:
+                self.assertEqual('ntfs', _get_volume_fstype(f'{dev}p1'))
+                self.create_data(dev, p1)
+                self.assertEqual(
+                    summarize_partitions(dev), [
+                        PartData(number=1, offset=1 << 20, size=size),
+                    ])
+                self.check_fssize(dev, p1, 'ntfs', size)
+
+        p1 = config.add_part(size=180 << 20, offset=1 << 20, number=1,
+                             fstype='ntfs')
+        size_to(180 << 20)
+
+        config.set_preserve()
+        p1['resize'] = True
+
+        size_to(160 << 20)
+        size_to(140 << 20)
+
     def test_resize_up_ext2(self):
         self._do_test_resize(40, 80, 'ext2')