lib/pb-config: Add autoboot timeout to configuration vars

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index d14e54fd2ec99b5ee46cfa87bf0bc4582c6e6d64..a06dafc03c6f92808f6c0c35a28b9dfaed470e04 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -13,6 +13,7 @@
 #include <log/log.h>
 #include <types/types.h>
 #include <system/system.h>
+#include <process/process.h>
 #include <url/url.h>
 
 #include "device-handler.h"
@@ -207,7 +208,7 @@ void device_handler_add_device(struct device_handler *handler,
 
 static int mount_device(struct discover_device *dev)
 {
-       const char *argv[6];
+       int rc;
 
        if (!dev->device_path)
                return -1;
@@ -220,29 +221,20 @@ static int mount_device(struct discover_device *dev)
                pb_log("couldn't create mount directory %s: %s\n",
                                dev->mount_path, strerror(errno));
 
-       argv[0] = pb_system_apps.mount;
-       argv[1] = dev->device_path;
-       argv[2] = dev->mount_path;
-       argv[3] = "-o";
-       argv[4] = "ro";
-       argv[5] = NULL;
-
-       if (pb_run_cmd(argv, 1, 0)) {
+       rc = process_run_simple(dev, pb_system_apps.mount,
+                       dev->device_path, dev->mount_path,
+                       "-o", "ro", NULL);
 
-               /* Retry mount without ro option. */
-
-               argv[0] = pb_system_apps.mount;
-               argv[1] = dev->device_path;
-               argv[2] = dev->mount_path;
-               argv[3] = NULL;
+       if (!rc)
+               return 0;
 
-               if (pb_run_cmd(argv, 1, 0))
-                       goto out_rmdir;
-       }
+       /* Retry mount without ro option. */
+       rc = process_run_simple(dev, pb_system_apps.mount,
+                       dev->device_path, dev->mount_path, NULL);
 
-       return 0;
+       if (!rc)
+               return 0;
 
-out_rmdir:
        pb_rmdir_recursive(mount_base(), dev->mount_path);
        return -1;
 }
@@ -250,28 +242,12 @@ out_rmdir:
 static int umount_device(struct discover_device *dev)
 {
        int status;
-       pid_t pid;
 
        if (!dev->mount_path)
                return 0;
 
-       pid = fork();
-       if (pid == -1) {
-               pb_log("%s: fork failed: %s\n", __func__, strerror(errno));
-               return -1;
-       }
-
-       if (pid == 0) {
-               execl(pb_system_apps.umount, pb_system_apps.umount,
-                                               dev->mount_path, NULL);
-               exit(EXIT_FAILURE);
-       }
-
-       if (waitpid(pid, &status, 0) == -1) {
-               pb_log("%s: waitpid failed: %s\n", __func__,
-                               strerror(errno));
-               return -1;
-       }
+       status = process_run_simple(dev, pb_system_apps.umount,
+                       dev->mount_path, NULL);
 
        if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
                return -1;
@@ -443,7 +419,7 @@ static void set_default(struct device_handler *handler,
                return;
 
        handler->default_boot_option = opt;
-       handler->sec_to_boot = DEFAULT_BOOT_TIMEOUT_SEC;
+       handler->sec_to_boot = config_get()->autoboot_timeout_sec;
 
        pb_log("Boot option %s set as default, timeout %u sec.\n",
               opt->option->id, handler->sec_to_boot);