mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
[PR #7304/324c22f6 backport][stable-7] Prevent parted warnings in script mode (#7365)
Prevent parted warnings in script mode (#7304)
* Prevent parted warnings in script mode
* Update parted.py with check parted version
* Typo
* Create 7304-prevent-parted-warnings.yml
* Update 7304-prevent-parted-warnings.yml
* Update 7304-prevent-parted-warnings.yml
* Update 7304-prevent-parted-warnings.yml
* Update 7304-prevent-parted-warnings.yml
* Update 7304-prevent-parted-warnings.yml
* Update changelogs/fragments/7304-prevent-parted-warnings.yml
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update plugins/modules/parted.py
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update parted.py - simplification
---------
Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 324c22f612
)
Co-authored-by: oldmanhere <79988786+oldmanhere@users.noreply.github.com>
This commit is contained in:
parent
8385d2eb39
commit
ef8fb888cd
2 changed files with 13 additions and 1 deletions
2
changelogs/fragments/7304-prevent-parted-warnings.yml
Normal file
2
changelogs/fragments/7304-prevent-parted-warnings.yml
Normal file
|
@ -0,0 +1,2 @@
|
|||
minor_changes:
|
||||
- parted - on resize, use ``--fix`` option if available (https://github.com/ansible-collections/community.general/pull/7304).
|
|
@ -569,8 +569,18 @@ def parted(script, device, align):
|
|||
if align == 'undefined':
|
||||
align_option = ''
|
||||
|
||||
"""
|
||||
Use option --fix (-f) if available. Versions prior
|
||||
to 3.4.64 don't have it. For more information see:
|
||||
http://savannah.gnu.org/news/?id=10114
|
||||
"""
|
||||
if parted_version() >= (3, 4, 64):
|
||||
script_option = '-s -f'
|
||||
else:
|
||||
script_option = '-s'
|
||||
|
||||
if script and not module.check_mode:
|
||||
command = "%s -s -m %s %s -- %s" % (parted_exec, align_option, device, script)
|
||||
command = "%s %s -m %s %s -- %s" % (parted_exec, script_option, align_option, device, script)
|
||||
rc, out, err = module.run_command(command)
|
||||
|
||||
if rc != 0:
|
||||
|
|
Loading…
Reference in a new issue