sdfdsf

usr/libexec/greenboot/greenboot-grub2-set-counter

@@ -1,6 +1,13 @@
 #!/bin/bash
 set -eo pipefail
 
+function remount_boot_ro {
+    if grep -q " /boot .* rw," /proc/mounts; then
+        mount -o remount,ro /boot || exit 5
+    fi
+    return
+}
+
 GREENBOOT_CONFIGURATION_FILE=/etc/greenboot/greenboot.conf
 if test -f "$GREENBOOT_CONFIGURATION_FILE"; then
     # shellcheck source=etc/greenboot/greenboot.conf
@@ -17,28 +24,22 @@ fi
 
 # Remount /boot as read-only if it was mounted as read-write
 if grep -q " /boot .* rw," /proc/mounts; then
-    mount -o remount,ro /boot || exit 1
+    mount -o remount,ro /boot || exit 5
 fi
 
 if ! /usr/bin/grub2-editenv - set boot_counter="$max_boot_attempts"; then
  # If the first command fails, remount /boot as read-only and exit with failure
-    if grep -q " /boot .* rw," /proc/mounts; then
-        mount -o remount,ro /boot || exit 1
-    fi
+    remount_boot_ro
     exit 1
 fi
 
 if ! /usr/bin/grub2-editenv /boot/grub2/grubenv set boot_success=0; then
     # If the first command fails, remount /boot as read-only and exit with failure
-    if grep -q " /boot .* rw," /proc/mounts; then
-        mount -o remount,ro /boot || exit 1
-    fi
+    remount_boot_ro
     exit 1
 fi
 
-# Remount /boot as read-only if it was mounted as read-write
-if grep -q " /boot .* rw," /proc/mounts; then
-    mount -o remount,ro /boot || exit 1
-fi
+# Revert /boot as read-only
+remount_boot_ro
 
 echo "<3>GRUB2 environment variables have been set for system upgrade. Max boot attempts is $max_boot_attempts"

usr/libexec/greenboot/greenboot-grub2-set-success

@@ -4,14 +4,14 @@ set -eo pipefail
 
 function remount_boot_ro {
     if grep -q " /boot .* rw," /proc/mounts; then
-        mount -o remount,ro /boot || exit 1
+        mount -o remount,ro /boot || exit 5
     fi
     return
 }
 
 # Check if /boot is mounted as read-only, and remount as read-write if necessary
 if grep -q " /boot .* ro," /proc/mounts; then
-    mount -o remount,rw /boot || exit 1
+    mount -o remount,rw /boot || exit 5
 fi
 
 # Run the grub2-editenv commands

usr/libexec/greenboot/greenboot-rpm-ostree-grub2-check-fallback

@@ -3,7 +3,7 @@ set -euo pipefail
 
 function remount_boot_ro {
     if grep -q " /boot .* rw," /proc/mounts; then
-        mount -o remount,ro /boot || exit 1
+        mount -o remount,ro /boot || exit 5
     fi
     return
 }
@@ -23,7 +23,7 @@ if grub2-editenv list | grep -q "^boot_counter=-1$"; then
 
   # Check if /boot is mounted as read-only, and remount as read-write if necessary
   if grep -q " /boot .* ro," /proc/mounts; then
-      mount -o remount,rw /boot || exit 1
+      mount -o remount,rw /boot || exit 5
   fi
 
   if ! /usr/bin/grub2-editenv - unset boot_counter; then