diff options
| author | Jason Zions <jasonzio@microsoft.com> | 2018-11-12 18:43:42 +0000 |
|---|---|---|
| committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2018-11-12 18:43:42 +0000 |
| commit | 6f9512049bbb594c3f01ffcd2ab25ae4e016f01e (patch) | |
| tree | 2b576eb6c7bdb62954aad4c93ac8c81c16e167fb /cloudinit | |
| parent | d910ecd15de642d73a36e935704e54370f93c45b (diff) | |
| download | vyos-cloud-init-6f9512049bbb594c3f01ffcd2ab25ae4e016f01e.tar.gz vyos-cloud-init-6f9512049bbb594c3f01ffcd2ab25ae4e016f01e.zip | |
azure: Accept variation in error msg from mount for ntfs volumes
If Azure detects an ntfs filesystem type during mount attempt, it should
still report the resource device as reformattable. There are slight
differences in error message format on RedHat and SuSE. This patch
simplifies the expected error match to work on both distributions.
LP: #1799338
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/sources/DataSourceAzure.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py index 5ec6096f..6e1797ea 100644 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py @@ -725,7 +725,7 @@ def can_dev_be_reformatted(devpath, preserve_ntfs): file_count = util.mount_cb(cand_path, count_files, mtype="ntfs", update_env_for_mount={'LANG': 'C'}) except util.MountFailedError as e: - if "mount: unknown filesystem type 'ntfs'" in str(e): + if "unknown filesystem type 'ntfs'" in str(e): return True, (bmsg + ' but this system cannot mount NTFS,' ' assuming there are no important files.' ' Formatting allowed.') |