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

mount.py no rmdir when state=='absent' #569

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

mount.py no rmdir when state=='absent' #569

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5ee818e
Update mount.py
YvesMP Sep 18, 2024
966df79
Update mount.py
YvesMP Oct 3, 2024
f7f54f2
Update mount.py
YvesMP Oct 3, 2024
2840256
delete trailing spaces in mount.py
YvesMP Oct 3, 2024
5bc6f63
Update mount.py
YvesMP Oct 4, 2024
841a0f3
modules/mount.py
YvesMP Oct 11, 2024
5a16ef3
Add files via upload
YvesMP Oct 11, 2024
70b838f
Add files via upload
YvesMP Oct 11, 2024
2c8aad9
Update 569_keep_mountpoint.yml
YvesMP Oct 11, 2024
572167b
Update mount.py
YvesMP Oct 11, 2024
d05a5c7
Update 569_keep_mountpoint.yml
YvesMP Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions plugins/modules/mount.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,11 +899,6 @@ def main():
module.fail_json(
msg="Error unmounting %s: %s" % (name, msg))

if os.path.exists(name):
Copy link
Collaborator

Choose a reason for hiding this comment

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

This will change the behavior of state: absent.
But I don't think the rmdir logic should be skipped. Because it breaks backward compatibility.
If you want to skip it, how about adding keep_mountpoint or preserve_mountpoint to keep the mountpoint to avoid Directory not empty error instead of removing this section.

If this is set as true, you can skip rmdir section. Also, if the default value is set as false, to keep backward compatibility, you can set it to false by default.

try:
os.rmdir(name)
except (OSError, IOError) as e:
module.fail_json(msg="Error rmdir %s: %s" % (name, to_native(e)))
elif state == 'unmounted':
if ismount(name) or is_bind_mounted(module, linux_mounts, name):
if not module.check_mode:
Expand Down