Skip to content

Commit 4e54a90

Browse files
committed
qa: ceph.py mkfs.ext4 has no -f
Addresses probable issue: mkfs.ext4: invalid option -- 'f' Fixes: https://tracker.ceph.com/issues/10797 Signed-off-by: Kyr Shatskyy <[email protected]>
1 parent c1b69fb commit 4e54a90

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

qa/tasks/ceph.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,9 @@ def cluster(ctx, config):
990990
try:
991991
remote.run(args=['yes', run.Raw('|')] + ['sudo'] + mkfs + [dev])
992992
except run.CommandFailedError:
993-
# Newer btfs-tools doesn't prompt for overwrite, use -f
993+
if fs != 'btrfs':
994+
raise
995+
# Newer btrfs-tools doesn't prompt for overwrite, use -f
994996
if '-f' not in mount_options:
995997
mkfs_options.append('-f')
996998
mkfs = ['mkfs.%s' % fs] + mkfs_options

0 commit comments

Comments
 (0)