Rename and expose detect_and_mount_boot

Author: silkeh

src/bootman/bootman.c

@@ -212,7 +212,7 @@ bool boot_manager_set_prefix(BootManager *self, char *prefix)
                 free(self->user_initrd_freestanding_dir);
         }
         self->user_initrd_freestanding_dir = user_initrd_dir;
-        
+
         if (self->bootloader) {
                 self->bootloader->destroy(self);
                 self->bootloader = NULL;
@@ -331,7 +331,7 @@ bool boot_manager_remove_kernel_wrapper(BootManager *self, const Kernel *kernel)
         CHECK_ERR_RET_VAL(!kernels || kernels->len == 0, false,
                           "No kernels discovered in %s, bailing", self->kernel_dir);
 
-        did_mount = detect_and_mount_boot(self, &boot_dir);
+        did_mount = boot_manager_detect_and_mount_boot(self, &boot_dir);
         CHECK_DBG_RET_VAL(did_mount < 0, false, "Boot was not mounted");
 
         for (uint16_t i = 0; i < kernels->len; i++) {
@@ -371,7 +371,7 @@ bool boot_manager_remove_kernel(BootManager *self, const Kernel *kernel)
         return self->bootloader->remove_kernel(self, kernel);
 }
 
-int detect_and_mount_boot(BootManager *self, char **boot_dir) {
+int boot_manager_detect_and_mount_boot(BootManager *self, char **boot_dir) {
         autofree(char) *boot_dev = NULL;
         const char *prefix;
         int wanted_boot_mask;
@@ -412,7 +412,7 @@ bool boot_manager_set_default_kernel(BootManager *self, const Kernel *kernel)
         CHECK_ERR_RET_VAL(!kernels || kernels->len == 0, false,
                           "No kernels discovered in %s, bailing", self->kernel_dir);
 
-        did_mount = detect_and_mount_boot(self, &boot_dir);
+        did_mount = boot_manager_detect_and_mount_boot(self, &boot_dir);
         CHECK_DBG_RET_VAL(did_mount < 0, false, "Boot was not mounted");
 
         for (uint16_t i = 0; i < kernels->len; i++) {
@@ -608,7 +608,7 @@ char **boot_manager_list_kernels(BootManager *self)
         /* Sort them to ensure static ordering */
         nc_array_qsort(kernels, kernel_compare_reverse);
 
-        did_mount = detect_and_mount_boot(self, &boot_dir);
+        did_mount = boot_manager_detect_and_mount_boot(self, &boot_dir);
         if (did_mount >= 0) {
                 default_kernel = boot_manager_get_default_kernel(self);
                 if (did_mount > 0) {

src/bootman/bootman.h

@@ -297,6 +297,13 @@ bool boot_manager_set_default_kernel(BootManager *manager, const Kernel *kernel)
  */
 char *boot_manager_get_default_kernel(BootManager *manager);
 
+/**
+ * Detect and mount the boot directory.
+ * @param boot_dir Path indicating the mounted boot directory.
+ * @return an integer value, indicating success or failure.
+ */
+int boot_manager_detect_and_mount_boot(BootManager *self, char **boot_dir);
+
 /**
  * Return the CbmDeviceProbe for the root partition
  *

src/bootman/bootman_private.h

@@ -71,7 +71,7 @@ int mount_boot(BootManager *self, char **boot_directory);
  *
  * @see mount_boot() for return and error conditions.
  */
-int detect_and_mount_boot(BootManager *self, char **boot_dir);
+int boot_manager_detect_and_mount_boot(BootManager *self, char **boot_dir);
 
 /**
  * Internal function to sort by Kernel structs by release number (highest first)

src/bootman/update.c

@@ -41,7 +41,7 @@ bool boot_manager_update(BootManager *self)
                 return boot_manager_update_image(self);
         }
 
-        did_mount = detect_and_mount_boot(self, &boot_dir);
+        did_mount = boot_manager_detect_and_mount_boot(self, &boot_dir);
         if (did_mount >= 0) {
                 /* Do a native update */
                 ret = boot_manager_update_native(self);