X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=devices%2Fudev-helper.c;h=661fb08b4ef9c2021984109b78d2d3af68fe9943;hp=6a9a42bac12e9c626e1c768dd7664edf759ac74c;hb=238549fe012d19681ede101f02fc4f653402e550;hpb=6ce15c4265d3813ee311756ec03c6e4da74c1dbd diff --git a/devices/udev-helper.c b/devices/udev-helper.c index 6a9a42b..661fb08 100644 --- a/devices/udev-helper.c +++ b/devices/udev-helper.c @@ -1,6 +1,9 @@ +#define _GNU_SOURCE + #include #include +#include #include #include #include @@ -15,7 +18,7 @@ #include #include -#include "udev-helper.h" +#include "parser.h" #include "petitboot-paths.h" /* Define below to operate without the frontend */ @@ -24,88 +27,34 @@ /* Delay in seconds between polling of removable devices */ #define REMOVABLE_SLEEP_DELAY 2 -extern struct parser native_parser; -extern struct parser yaboot_parser; -extern struct parser kboot_parser; static FILE *logf; static int sock; -/* array of parsers, ordered by priority */ -static struct parser *parsers[] = { - &native_parser, - &yaboot_parser, - &kboot_parser, - NULL -}; - -#define log(...) fprintf(logf, __VA_ARGS__) - -static void iterate_parsers(const char *devpath, const char *mountpoint) +void pb_log(const char *fmt, ...) { - int i; + va_list ap; - log("trying parsers for %s@%s\n", devpath, mountpoint); - - for (i = 0; parsers[i]; i++) { - log("\ttrying parser '%s'\n", parsers[i]->name); - /* just use a dummy device path for now */ - if (parsers[i]->parse(devpath, mountpoint)) - /*return*/; - } - log("\tno boot_options found\n"); + va_start(ap, fmt); + vfprintf(logf, fmt, ap); + va_end(ap); } static void print_boot_option(const struct boot_option *opt) { - log("\tname: %s\n", opt->name); - log("\tdescription: %s\n", opt->description); - log("\tboot_image: %s\n", opt->boot_image_file); - log("\tinitrd: %s\n", opt->initrd_file); - log("\tboot_args: %s\n", opt->boot_args); + pb_log("\tname: %s\n", opt->name); + pb_log("\tdescription: %s\n", opt->description); + pb_log("\tboot_image: %s\n", opt->boot_image_file); + pb_log("\tinitrd: %s\n", opt->initrd_file); + pb_log("\tboot_args: %s\n", opt->boot_args); } static void print_device(const struct device *dev) { - log("\tid: %s\n", dev->id); - log("\tname: %s\n", dev->name); - log("\tdescription: %s\n", dev->description); - log("\tboot_image: %s\n", dev->icon_file); -} - - -void free_device(struct device *dev) -{ - if (!dev) - return; - if (dev->id) - free(dev->id); - if (dev->name) - free(dev->name); - if (dev->description) - free(dev->description); - if (dev->icon_file) - free(dev->icon_file); - free(dev); -} - -void free_boot_option(struct boot_option *opt) -{ - if (!opt) - return; - if (opt->name) - free(opt->name); - if (opt->description) - free(opt->description); - if (opt->icon_file) - free(opt->icon_file); - if (opt->boot_image_file) - free(opt->boot_image_file); - if (opt->initrd_file) - free(opt->initrd_file); - if (opt->boot_args) - free(opt->boot_args); - free(opt); + pb_log("\tid: %s\n", dev->id); + pb_log("\tname: %s\n", dev->name); + pb_log("\tdescription: %s\n", dev->description); + pb_log("\tboot_image: %s\n", dev->icon_file); } static int write_action(int fd, enum device_action action) @@ -122,7 +71,7 @@ static int write_string(int fd, const char *str) if (!str) { len_buf = 0; if (write(fd, &len_buf, sizeof(len_buf)) != sizeof(len_buf)) { - log("write failed: %s\n", strerror(errno)); + pb_log("write failed: %s\n", strerror(errno)); return -1; } return 0; @@ -130,20 +79,20 @@ static int write_string(int fd, const char *str) len = strlen(str); if (len > (1ull << (sizeof(len_buf) * 8 - 1))) { - log("string too large\n"); + pb_log("string too large\n"); return -1; } len_buf = __cpu_to_be32(len); if (write(fd, &len_buf, sizeof(len_buf)) != sizeof(len_buf)) { - log("write failed: %s\n", strerror(errno)); + pb_log("write failed: %s\n", strerror(errno)); return -1; } while (pos < len) { int rc = write(fd, str, len - pos); if (rc <= 0) { - log("write failed: %s\n", strerror(errno)); + pb_log("write failed: %s\n", strerror(errno)); return -1; } pos += rc; @@ -157,7 +106,7 @@ int add_device(const struct device *dev) { int rc; - log("device added:\n"); + pb_log("device added:\n"); print_device(dev); rc = write_action(sock, DEV_ACTION_ADD_DEVICE) || write_string(sock, dev->id) || @@ -166,7 +115,7 @@ int add_device(const struct device *dev) write_string(sock, dev->icon_file); if (rc) - log("error writing device %s to socket\n", dev->name); + pb_log("error writing device %s to socket\n", dev->name); return rc; } @@ -175,7 +124,7 @@ int add_boot_option(const struct boot_option *opt) { int rc; - log("boot option added:\n"); + pb_log("boot option added:\n"); print_boot_option(opt); rc = write_action(sock, DEV_ACTION_ADD_OPTION) || @@ -188,7 +137,7 @@ int add_boot_option(const struct boot_option *opt) write_string(sock, opt->boot_args); if (rc) - log("error writing boot option %s to socket\n", opt->name); + pb_log("error writing boot option %s to socket\n", opt->name); return rc; } @@ -207,7 +156,7 @@ int connect_to_socket() fd = socket(PF_UNIX, SOCK_STREAM, 0); if (fd == -1) { - log("can't create socket: %s\n", strerror(errno)); + pb_log("can't create socket: %s\n", strerror(errno)); return -1; } @@ -215,7 +164,7 @@ int connect_to_socket() strcpy(addr.sun_path, PBOOT_DEVICE_SOCKET); if (connect(fd, (struct sockaddr *)&addr, sizeof(addr))) { - log("can't connect to %s: %s\n", + pb_log("can't connect to %s: %s\n", addr.sun_path, strerror(errno)); return -1; } @@ -226,7 +175,7 @@ int connect_to_socket() int fd; fd = open("./debug_socket", O_WRONLY | O_CREAT, 0640); if (fd < 0) { - log("can't create output file: %s\n", strerror(errno)); + pb_log("can't create output file: %s\n", strerror(errno)); return -1; } sock = fd; @@ -234,31 +183,95 @@ int connect_to_socket() #endif } -int mount_device(const char *dev_path, char *mount_path) +struct device_map { + char *dev, *mnt; +}; + +#define DEVICE_MAP_SIZE 32 +static struct device_map device_map[DEVICE_MAP_SIZE]; + +const char *mountpoint_for_device(const char *dev_path) { - char *dir; + int i; const char *basename; - int pid, status, rc = -1; - basename = strrchr(dev_path, '/'); - if (basename) - basename++; - else + /* shorten '/dev/foo' to 'foo' */ + basename = strrchr(dev_path, '/'); + if (basename) + basename++; + else basename = dev_path; - - /* create a unique mountpoint */ - dir = malloc(strlen(TMP_DIR) + 13 + strlen(basename)); - sprintf(dir, "%s/mnt-%s-XXXXXX", TMP_DIR, basename); - - if (!mkdtemp(dir)) { - log("failed to create temporary directory in %s: %s", - TMP_DIR, strerror(errno)); - goto out; + + /* check existing entries in the map */ + for (i = 0; (i < DEVICE_MAP_SIZE) && device_map[i].dev; i++) + if (!strcmp(device_map[i].dev, basename)) + return device_map[i].mnt; + + if (i == DEVICE_MAP_SIZE) + return NULL; + + device_map[i].dev = strdup(dev_path); + asprintf(&device_map[i].mnt, "%s/%s", TMP_DIR, basename); + return device_map[i].mnt; +} + +/** + * Resolve a path given in a config file, to a path in the local filesystem. + * Paths may be of the form: + * device:path (eg /dev/sda:/boot/vmlinux) + * + * or just a path: + * /boot/vmlinux + * - in this case, the default mountpoint is used. + * + * Returns a newly-allocated string containing a full path to the file in path + */ +char *resolve_path(const char *path, const char *default_mountpoint) +{ + char *ret; + const char *devpath, *sep; + + sep = strchr(path, ':'); + if (!sep) { + devpath = default_mountpoint; + asprintf(&ret, "%s/%s", devpath, path); + } else { + /* copy just the device name into tmp */ + char *dev = strndup(path, sep - path); + devpath = mountpoint_for_device(dev); + asprintf(&ret, "%s/%s", devpath, sep + 1); + free(dev); } + return ret; +} + +int mount_device(const char *dev_path) +{ + const char *dir; + int pid, status, rc = -1; + struct stat statbuf; + + dir = mountpoint_for_device(dev_path); + + if (stat(dir, &statbuf)) { + if (mkdir(dir, 0755)) { + pb_log("couldn't create directory %s: %s\n", + dir, strerror(errno)); + goto out; + } + } else { + if (!S_ISDIR(statbuf.st_mode)) { + pb_log("mountpoint %s exists, " + "but isn't a directory\n", dir); + goto out; + } + } + + pid = fork(); if (pid == -1) { - log("%s: fork failed: %s\n", __FUNCTION__, strerror(errno)); + pb_log("%s: fork failed: %s\n", __FUNCTION__, strerror(errno)); goto out; } @@ -268,17 +281,15 @@ int mount_device(const char *dev_path, char *mount_path) } if (waitpid(pid, &status, 0) == -1) { - log("%s: waitpid failed: %s\n", __FUNCTION__, strerror(errno)); + pb_log("%s: waitpid failed: %s\n", __FUNCTION__, + strerror(errno)); goto out; } - if (WIFEXITED(status) && WEXITSTATUS(status) == 0) { - strcpy(mount_path, dir); + if (WIFEXITED(status) && WEXITSTATUS(status) == 0) rc = 0; - } out: - free(dir); return rc; } @@ -289,7 +300,7 @@ static int unmount_device(const char *dev_path) pid = fork(); if (pid == -1) { - log("%s: fork failed: %s\n", __FUNCTION__, strerror(errno)); + pb_log("%s: fork failed: %s\n", __FUNCTION__, strerror(errno)); return -1; } @@ -299,7 +310,8 @@ static int unmount_device(const char *dev_path) } if (waitpid(pid, &status, 0) == -1) { - log("%s: waitpid failed: %s\n", __FUNCTION__, strerror(errno)); + pb_log("%s: waitpid failed: %s\n", __FUNCTION__, + strerror(errno)); return -1; } @@ -308,22 +320,6 @@ static int unmount_device(const char *dev_path) return rc; } -const char *generic_icon_file(enum generic_icon_type type) -{ - switch (type) { - case ICON_TYPE_DISK: - return artwork_pathname("hdd.png"); - case ICON_TYPE_USB: - return artwork_pathname("usbpen.png"); - case ICON_TYPE_OPTICAL: - return artwork_pathname("cdrom.png"); - case ICON_TYPE_NETWORK: - case ICON_TYPE_UNKNOWN: - break; - } - return artwork_pathname("hdd.png"); -} - static const struct device fake_boot_devices[] = { { @@ -390,7 +386,7 @@ static int is_removable_device(const char *sysfs_path) sprintf(full_path, "/sys/%s/removable", sysfs_path); fd = open(full_path, O_RDONLY); - printf(" -> removable check on %s, fd=%d\n", full_path, fd); + pb_log(" -> removable check on %s, fd=%d\n", full_path, fd); if (fd < 0) return 0; buf_len = read(fd, buf, 79); @@ -401,22 +397,59 @@ static int is_removable_device(const char *sysfs_path) return strtol(buf, NULL, 10); } +static int is_ignored_device(const char *devname) +{ + static const char *ignored_devices[] = { "/dev/ram", NULL }; + const char **dev; + + for (dev = ignored_devices; *dev; dev++) + if (!strncmp(devname, *dev, strlen(*dev))) + return 1; + + return 0; +} + static int found_new_device(const char *dev_path) { - char mountpoint[PATH_MAX]; + const char *mountpoint = mountpoint_for_device(dev_path); - if (mount_device(dev_path, mountpoint)) { - log("failed to mount %s\n", dev_path); + if (mount_device(dev_path)) { + pb_log("failed to mount %s\n", dev_path); return EXIT_FAILURE; } - log("mounted %s at %s\n", dev_path, mountpoint); + pb_log("mounted %s at %s\n", dev_path, mountpoint); iterate_parsers(dev_path, mountpoint); return EXIT_SUCCESS; } +static void detach_and_sleep(int sec) +{ + static int forked = 0; + int rc = 0; + + if (sec <= 0) + return; + + if (!forked) { + pb_log("running in background..."); + rc = fork(); + forked = 1; + } + + if (rc == 0) { + sleep(sec); + + } else if (rc == -1) { + perror("fork()"); + exit(EXIT_FAILURE); + } else { + exit(EXIT_SUCCESS); + } +} + static int poll_device_plug(const char *dev_path, int *optical) { @@ -424,36 +457,36 @@ static int poll_device_plug(const char *dev_path, /* Polling loop for optical drive */ for (; (*optical) != 0; ) { - printf("poll for optical drive insertion ...\n"); + pb_log("poll for optical drive insertion ...\n"); fd = open(dev_path, O_RDONLY|O_NONBLOCK); if (fd < 0) return EXIT_FAILURE; rc = ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT); close(fd); if (rc == -1) { - printf("not an optical drive, fallback...\n"); + pb_log("not an optical drive, fallback...\n"); break; } *optical = 1; if (rc == CDS_DISC_OK) return EXIT_SUCCESS; - printf("no... waiting\n"); - sleep(REMOVABLE_SLEEP_DELAY); + pb_log("no... waiting\n"); + detach_and_sleep(REMOVABLE_SLEEP_DELAY); } /* Fall back to bare open() */ *optical = 0; for (;;) { - printf("poll for non-optical drive insertion ...\n"); + pb_log("poll for non-optical drive insertion ...\n"); fd = open(dev_path, O_RDONLY); if (fd < 0 && errno != ENOMEDIUM) return EXIT_FAILURE; close(fd); if (fd >= 0) return EXIT_SUCCESS; - printf("no... waiting\n"); - sleep(REMOVABLE_SLEEP_DELAY); + pb_log("no... waiting\n"); + detach_and_sleep(REMOVABLE_SLEEP_DELAY); } } @@ -462,7 +495,7 @@ static int poll_device_unplug(const char *dev_path, int optical) int rc, fd; for (;optical;) { - printf("poll for optical drive removal ...\n"); + pb_log("poll for optical drive removal ...\n"); fd = open(dev_path, O_RDONLY|O_NONBLOCK); if (fd < 0) return EXIT_FAILURE; @@ -470,21 +503,21 @@ static int poll_device_unplug(const char *dev_path, int optical) close(fd); if (rc != CDS_DISC_OK) return EXIT_SUCCESS; - printf("no... waiting\n"); - sleep(REMOVABLE_SLEEP_DELAY); + pb_log("no... waiting\n"); + detach_and_sleep(REMOVABLE_SLEEP_DELAY); } /* Fall back to bare open() */ for (;;) { - printf("poll for non-optical drive removal ...\n"); + pb_log("poll for non-optical drive removal ...\n"); fd = open(dev_path, O_RDONLY); if (fd < 0 && errno != ENOMEDIUM) return EXIT_FAILURE; close(fd); if (fd < 0) return EXIT_SUCCESS; - printf("no... waiting\n"); - sleep(REMOVABLE_SLEEP_DELAY); + pb_log("no... waiting\n"); + detach_and_sleep(REMOVABLE_SLEEP_DELAY); } } @@ -507,7 +540,7 @@ static int poll_removable_device(const char *sysfs_path, /* Unmount it repeatedly, if needs be */ while (mounted && !unmount_device(dev_path)) ; - sleep(1); + detach_and_sleep(1); } } @@ -516,16 +549,16 @@ int main(int argc, char **argv) char *dev_path, *action; int rc; - /*if (fork()) - return EXIT_SUCCESS; - */ action = getenv("ACTION"); - logf = stdout; + logf = fopen("/var/tmp/petitboot-udev-helpers.log", "a"); + if (!logf) + logf = stdout; + pb_log("%d started\n", getpid()); rc = EXIT_SUCCESS; if (!action) { - log("missing environment?\n"); + pb_log("missing environment?\n"); return EXIT_FAILURE; } @@ -533,7 +566,7 @@ int main(int argc, char **argv) return EXIT_FAILURE; if (streq(action, "fake")) { - log("fake mode"); + pb_log("fake mode"); add_device(&fake_boot_devices[0]); add_boot_option(&fake_boot_options[0]); @@ -547,10 +580,13 @@ int main(int argc, char **argv) dev_path = getenv("DEVNAME"); if (!dev_path) { - log("missing environment?\n"); + pb_log("missing environment?\n"); return EXIT_FAILURE; } + if (is_ignored_device(dev_path)) + return EXIT_SUCCESS; + if (streq(action, "add")) { char *sysfs_path = getenv("DEVPATH"); if (sysfs_path && is_removable_device(sysfs_path)) @@ -558,7 +594,7 @@ int main(int argc, char **argv) else rc = found_new_device(dev_path); } else if (streq(action, "remove")) { - log("%s removed\n", dev_path); + pb_log("%s removed\n", dev_path); remove_device(dev_path); @@ -567,24 +603,8 @@ int main(int argc, char **argv) ; } else { - log("invalid action '%s'\n", action); + pb_log("invalid action '%s'\n", action); rc = EXIT_FAILURE; } return rc; } - -/* convenience function for parsers */ -char *join_paths(const char *a, const char *b) -{ - char *full_path; - - full_path = malloc(strlen(a) + strlen(b) + 2); - - strcpy(full_path, a); - if (b[0] != '/') - strcat(full_path, "/"); - strcat(full_path, b); - - return full_path; -} -