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 salt.modules.mount documentation #30668

Merged
merged 1 commit into from Jan 27, 2016
Merged

Fix salt.modules.mount documentation #30668

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions salt/modules/mount.py
View file
Open in desktop
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
'''
Salt module to manage unix mounts and the fstab file
Salt module to manage Unix mounts and the fstab file
'''

# Import python libs
Expand Down Expand Up @@ -309,7 +309,7 @@ def rm_fstab(name, device, config='/etc/fstab'):

.. code-block:: bash

salt '*' mount.rm_fstab /mnt/foo
salt '*' mount.rm_fstab /mnt/foo /dev/sdg
'''
modified = False

Expand Down Expand Up @@ -476,7 +476,7 @@ def rm_automaster(name, device, config='/etc/auto_salt'):

.. code-block:: bash

salt '*' mount.rm_automaster /mnt/foo
salt '*' mount.rm_automaster /mnt/foo /dev/sdg
'''
contents = automaster(config)
if name not in contents:
Expand Down Expand Up @@ -649,13 +649,13 @@ def set_automaster(

def automaster(config='/etc/auto_salt'):
'''
List the contents of the fstab
List the contents of the auto master

CLI Example:

.. code-block:: bash

salt '*' mount.fstab
salt '*' mount.automaster
'''
ret = {}
if not os.path.isfile(config):
Expand Down Expand Up @@ -772,7 +772,8 @@ def umount(name, device=None, user=None):

salt '*' mount.umount /mnt/foo

.. versionadded:: 2015.5.0
.. versionadded:: 2015.5.0
.. code-block:: bash

salt '*' mount.umount /mnt/foo /dev/xvdc1
'''
Expand Down