Merge c77c592fc6 into 12a1c25f5e

changelogs/fragments/346-boot-linux.yml

@@ -0,0 +1,3 @@
+---
+bugfix:
+  - mount - Handle ``boot`` option on Linux, NetBSD and OpenBSD correctly (https://github.com/ansible-collections/ansible.posix/issues/364).

plugins/modules/mount.py

@@ -835,11 +835,8 @@ def main():
             args['warnings'].append("Ignore the 'boot' due to 'opts' contains 'noauto'.")
         elif not module.params['boot']:
             args['boot'] = 'no'
-            if 'defaults' in opts:
-                args['warnings'].append("Ignore the 'boot' due to 'opts' contains 'defaults'.")
-            else:
-                opts.append('noauto')
-                args['opts'] = ','.join(opts)
+            opts.append('noauto')
+            args['opts'] = ','.join(opts)
 
     # If fstab file does not exist, we first need to create it. This mainly
     # happens when fstab option is passed to the module.

tests/integration/targets/mount/tasks/main.yml

@@ -367,6 +367,25 @@
       path: /tmp/myfs
       state: absent
 
+  - name: Mount the FS with noauto option and defaults
+    mount:
+      path: /tmp/myfs
+      src: /tmp/myfs.img
+      fstype: ext3
+      state: mounted
+      boot: no
+    register: mount_info
+
+  - name: assert the mount without noauto was successful
+    assert:
+      that:
+      - "'noauto' in mount_info['opts'].split(',')"
+
+  - name: Unmount FS
+    mount:
+      path: /tmp/myfs
+      state: absent
+
   - name: Remove the test FS
     file:
       path: '{{ item }}'