#include <sys/stat.h>
#include <sys/wait.h>
+#include <pb-config/pb-config.h>
#include <talloc/talloc.h>
#include <list/list.h>
#include <log/log.h>
#include <types/types.h>
#include <system/system.h>
+#include <process/process.h>
#include <url/url.h>
#include "device-handler.h"
struct waitset *waitset;
struct waiter *timeout_waiter;
- bool default_enabled;
+ bool autoboot_enabled;
unsigned int sec_to_boot;
struct discover_boot_option *default_boot_option;
return opt;
}
-static int device_match_path(struct discover_device *dev, const char *path)
-{
- return dev->device_path && !strcmp(dev->device_path, path);
-}
-
static int device_match_uuid(struct discover_device *dev, const char *uuid)
{
return dev->uuid && !strcmp(dev->uuid, uuid);
struct discover_device *device_lookup_by_name(struct device_handler *handler,
const char *name)
{
- struct discover_device *dev;
- char *path;
-
- if (strncmp(name, "/dev/", strlen("/dev/")))
- path = talloc_asprintf(NULL, "/dev/%s", name);
- else
- path = talloc_strdup(NULL, name);
-
- dev = device_lookup_by_path(handler, path);
+ if (!strncmp(name, "/dev/", strlen("/dev/")))
+ name += strlen("/dev/");
- talloc_free(path);
-
- return dev;
-}
-
-struct discover_device *device_lookup_by_path(
- struct device_handler *device_handler,
- const char *path)
-{
- return device_lookup(device_handler, device_match_path, path);
+ return device_lookup_by_id(handler, name);
}
struct discover_device *device_lookup_by_uuid(
static int mount_device(struct discover_device *dev)
{
- const char *argv[6];
+ int rc;
if (!dev->device_path)
return -1;
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;
}
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;
handler->waitset = waitset;
handler->dry_run = dry_run;
handler->default_boot_option = NULL;
- handler->default_enabled = true;
+ handler->autoboot_enabled = config_get()->autoboot_enabled;
list_init(&handler->unresolved_boot_options);
/* set up our mount point base */
return NULL;
}
+static enum device_type event_device_type(struct device *device,
+ struct event *event)
+{
+ const char *param;
+
+ param = event_get_param(event, "type");
+ if (!param) {
+ pb_log("%s: empty type\n", device->id);
+ return DEVICE_TYPE_UNKNOWN;
+ }
+
+ if (!strcmp(param, "disk") || !strcmp(param, "partition"))
+ return DEVICE_TYPE_DISK;
+
+ if (!strcmp(param, "net"))
+ return DEVICE_TYPE_NETWORK;
+
+ pb_log("%s: unknown type '%s'\n", device->id, param);
+ return DEVICE_TYPE_UNKNOWN;
+}
+
static struct discover_device *discover_device_create(
struct device_handler *handler,
struct discover_context *ctx,
struct event *event)
{
struct discover_device *dev;
- const char *devname;
+ const char *devnode;
dev = find_device(handler, event->device);
if (dev)
dev->device = talloc_zero(dev, struct device);
list_init(&dev->boot_options);
- devname = event_get_param(ctx->event, "DEVNAME");
- if (devname)
- dev->device_path = talloc_strdup(dev, devname);
+ devnode = event_get_param(ctx->event, "node");
+ if (devnode)
+ dev->device_path = talloc_strdup(dev, devnode);
dev->device->id = talloc_strdup(dev, event->device);
+ dev->device->type = event_device_type(dev->device, event);
talloc_set_destructor(dev, destroy_device);
status.progress = -1;
status.detail = NULL;
status.message = talloc_asprintf(handler,
- "Booting %s in %d sec", opt->option->name, sec);
+ "Booting %s in %u sec", opt->option->name, sec);
discover_server_notify_boot_status(handler->server, &status);
if (handler->default_boot_option)
return;
- if (!handler->default_enabled)
+ if (!handler->autoboot_enabled)
return;
- pb_log("Boot option %s set as default\n", opt->option->id);
-
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);
+
default_timeout(handler);
}
waiter_remove(handler->timeout_waiter);
handler->timeout_waiter = NULL;
- handler->default_enabled = false;
+ handler->autoboot_enabled = false;
/* we only send status if we had a default boot option queued */
if (!handler->default_boot_option)
projects / petitboot / blobdiff