From d40177802476b9a1f58871eb3197c741eb130113 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Wed, 7 Feb 2024 15:43:23 +0100
Subject: [PATCH] remount-usr: back to a simpler implementation

---
 remount-usr/tasks/main.yml | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/remount-usr/tasks/main.yml b/remount-usr/tasks/main.yml
index 18dfe6ce..034a66f5 100644
--- a/remount-usr/tasks/main.yml
+++ b/remount-usr/tasks/main.yml
@@ -2,27 +2,17 @@
 # findmnt returns 0 on hit, 1 on miss
 # If the return code is higher than 1, it's a blocking failure
 
-- name: "check if /usr is a mountpoint"
-  ansible.builtin.shell: "findmnt -n /usr &> /dev/null"
-  register: usr_mount_exists
-  failed_when: False
-  check_mode: False
-  changed_when: False
-
 - name: "check if /usr is a read-only partition"
   ansible.builtin.command:
     cmd: 'findmnt /usr --noheadings --options ro'
-  register: usr_partition
-  when: usr_mount_exists.rc == 0
   changed_when: False
   failed_when: usr_partition.rc > 1
+  register: usr_partition
   check_mode: False
 
 - name: "mount /usr in rw"
   ansible.builtin.command:
-    cmd: 'mount -o remount,rw /usr'
-  when:
-    - usr_mount_exists.rc == 0
-    - usr_partition.rc == 0
+    cmd: 'mount --options remount,rw /usr'
+  when: usr_partition.rc == 0
   notify: remount usr
   changed_when: False