move boot mount scripts to seperate file

Signed-off-by: saypaul <[email protected]>

greenboot.spec

@@ -155,6 +155,7 @@ install -DpZm 0644 etc/greenboot/greenboot.conf %{buildroot}%{_sysconfdir}/%{nam
 %{_unitdir}/greenboot-status.service
 %{_libexecdir}/%{name}/greenboot-grub2-set-counter
 %{_libexecdir}/%{name}/greenboot-grub2-set-success
+%{_libexecdir}/%{name}/greenboot-boot-remount.sh
 %{_unitdir}/greenboot-grub2-set-success.service
 %{_unitdir}/greenboot-grub2-set-counter.service
 %{_libexecdir}/%{name}/greenboot-rpm-ostree-grub2-check-fallback

usr/libexec/greenboot/greenboot-boot-remount.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+set -eo pipefail
+
+# Boolean variable to track if /boot was initially mounted as read-only
+# Ensure compatibility with rpm-ostree where /boot is rw but in bootc /boot is ro
+boot_was_ro=false
+
+# Remount /boot as read-only if it was mounted as read-only ealier
+function remount_boot_ro {
+    if $boot_was_ro; then
+        mount -o remount,ro /boot || exit 13
+    fi
+    return
+}
+
+# Remount /boot as read-write if it was mounted as read-only
+function remount_boot_rw {
+    if grep -q " /boot .* ro," /proc/mounts; then
+        mount -o remount,rw /boot || exit 13
+        boot_was_ro=true
+    fi
+    return
+    }

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

@@ -1,16 +1,6 @@
 #!/bin/bash
 set -eo pipefail
 
-# Boolean variable to track if /boot was initially mounted as read-only
-# Ensure compatibility with rpm-ostree where /boot is rw but in bootc /boot is ro
-boot_was_ro=false
-
-function remount_boot_ro {
-    if $boot_was_ro; then
-        mount -o remount,ro /boot || exit 13
-    fi
-    return
-}
 
 GREENBOOT_CONFIGURATION_FILE=/etc/greenboot/greenboot.conf
 if test -f "$GREENBOOT_CONFIGURATION_FILE"; then
@@ -26,11 +16,8 @@ else
     max_boot_attempts=3 # default to 3 attempts
 fi
 
-# Remount /boot as read-write if it was mounted as read-only
-if grep -q " /boot .* ro," /proc/mounts; then
-    mount -o remount,rw /boot || exit 13
-    boot_was_ro=true
-fi
+source /usr/libexec/greenboot/greenboot-boot-remount.sh
+remount_boot_rw
 
 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

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

@@ -2,22 +2,8 @@
 
 set -eo pipefail
 
-# Boolean variable to track if /boot was initially mounted as read-only
-# Ensure compatibility with rpm-ostree where /boot is rw but in bootc /boot is ro
-boot_was_ro=false
-
-function remount_boot_ro {
-    if $boot_was_ro; then
-        mount -o remount,ro /boot || exit 13
-    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 13
-    boot_was_ro=true
-fi
+source /usr/libexec/greenboot/greenboot-boot-remount.sh
+remount_boot_rw
 
 # Run the grub2-editenv commands
 if ! /usr/bin/grub2-editenv /boot/grub2/grubenv set boot_success=1; then

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

@@ -1,16 +1,6 @@
 #!/bin/bash
 set -euo pipefail
 
-# Boolean variable to track if /boot was initially mounted as read-only
-# Ensure compatibility with rpm-ostree where /boot is rw but in bootc /boot is ro
-boot_was_ro=false
-
-function remount_boot_ro {
-    if $boot_was_ro; then
-        mount -o remount,ro /boot || exit 13
-    fi
-    return
-}
 
 function attempt_rollback {
   # Check if the bootc command is available
@@ -44,11 +34,8 @@ if grub2-editenv list | grep -q "^boot_counter=-1$"; then
   fi
 
 
-  # 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 13
-      boot_was_ro=true
-  fi
+ source /usr/libexec/greenboot/greenboot-boot-remount.sh
+remount_boot_rw
 
   if ! /usr/bin/grub2-editenv - unset boot_counter; then
     # If the above command fails, remount /boot as read-only and exit with failure