diff options
| author | Harm Weites <harm@weites.com> | 2018-05-01 15:38:51 -0600 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2018-05-01 15:38:51 -0600 |
| commit | fed07fc6cddebcbc3e744926509c362d9e200aeb (patch) | |
| tree | 6d07e58b10c508fe423ac70caa66c55bb1a6e1c8 | |
| parent | 26fbb1a0ce89451edad83a47054cacb6dd7b6dcc (diff) | |
| download | vyos-cloud-init-fed07fc6cddebcbc3e744926509c362d9e200aeb.tar.gz vyos-cloud-init-fed07fc6cddebcbc3e744926509c362d9e200aeb.zip | |
FreeBSD: Invoke growfs on ufs filesystems such that it does not prompt.
By default, FreeBSD's growfs runs interactively asking a question
which can be mitigated using the '-y' command line option. The fix
here is simply to pass -y to growfs to avoid the prompt.
LP: #1404745
| -rw-r--r-- | cloudinit/config/cc_resizefs.py | 2 | ||||
| -rw-r--r-- | tests/unittests/test_handler/test_handler_resizefs.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_resizefs.py b/cloudinit/config/cc_resizefs.py index 82f29e10..2edddd0c 100644 --- a/cloudinit/config/cc_resizefs.py +++ b/cloudinit/config/cc_resizefs.py @@ -81,7 +81,7 @@ def _resize_xfs(mount_point, devpth): def _resize_ufs(mount_point, devpth): - return ('growfs', devpth) + return ('growfs', '-y', devpth) def _resize_zfs(mount_point, devpth): diff --git a/tests/unittests/test_handler/test_handler_resizefs.py b/tests/unittests/test_handler/test_handler_resizefs.py index 7a7ba1ff..f92175fd 100644 --- a/tests/unittests/test_handler/test_handler_resizefs.py +++ b/tests/unittests/test_handler/test_handler_resizefs.py @@ -147,7 +147,7 @@ class TestResizefs(CiTestCase): def test_resize_ufs_cmd_return(self): mount_point = '/' devpth = '/dev/sda2' - self.assertEqual(('growfs', devpth), + self.assertEqual(('growfs', '-y', devpth), _resize_ufs(mount_point, devpth)) @mock.patch('cloudinit.util.get_mount_info') |