Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix incorrect command-line parameters for Solaris #22865

Merged
merged 2 commits into from
Aug 24, 2017
Merged

Fix incorrect command-line parameters for Solaris #22865

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcb9460
Fix incorrect command-line parameters for Solaris
AlexZolotarenko Mar 22, 2017
a80fb84
Update mount.py
AlexZolotarenko Aug 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/ansible/modules/system/mount.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ def unset_mount(module, args):
def _set_fstab_args(fstab_file):
result = []

if fstab_file and fstab_file != '/etc/fstab':
if fstab_file and fstab_file != '/etc/fstab' and get_platform().lower() != 'sunos':
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please could you change it to:

    if (
            fstab_file and
            fstab_file != '/etc/fstab' and
            get_platform().lower() != 'sunos'):

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if I did it correct, but it's updated according your request.

Copy link
Contributor

@jtyr jtyr Aug 24, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks good!

if get_platform().lower().endswith('bsd'):
result.append('-F')
else:
Expand Down