X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=devices%2Fudev-helper.c;h=c113e55432177217c7fc144ded1b9e4ddc11ce69;hp=ade97872e3b075f20419b5667ea9a733e61e37c1;hb=392ef72ca8ea92ce8aacef01fda3046f0e9f59b2;hpb=db8001f511f8e8d928aa82113431067f968f4966 diff --git a/devices/udev-helper.c b/devices/udev-helper.c index ade9787..c113e55 100644 --- a/devices/udev-helper.c +++ b/devices/udev-helper.c @@ -12,17 +12,27 @@ #include #include #include +#include +#include #include "udev-helper.h" #include "petitboot-paths.h" +/* Define below to operate without the frontend */ +#undef USE_FAKE_SOCKET + +/* Delay in seconds between polling of removable devices */ +#define REMOVABLE_SLEEP_DELAY 2 + extern struct parser native_parser; +extern struct parser yaboot_parser; static FILE *logf; static int sock; /* array of parsers, ordered by priority */ static struct parser *parsers[] = { &native_parser, + &yaboot_parser, NULL }; @@ -48,13 +58,14 @@ 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); } static void print_device(const struct device *dev) { - log("\tid: %s\n", dev->name); + 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); @@ -188,7 +199,7 @@ int remove_device(const char *dev_path) int connect_to_socket() { -#if 1 +#ifndef USE_FAKE_SOCKET int fd; struct sockaddr_un addr; @@ -221,16 +232,21 @@ int connect_to_socket() #endif } -#define template "mnt-XXXXXX" - -static int mount_device(const char *dev_path, char *mount_path) +int mount_device(const char *dev_path, char *mount_path) { char *dir; + const char *basename; int pid, status, rc = -1; - /* create a unique mountpoint */ - dir = malloc(strlen(TMP_DIR) + 2 + strlen(template)); - sprintf(dir, "%s/%s", TMP_DIR, template); + 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", @@ -350,7 +366,10 @@ static const struct boot_option fake_boot_options[] = enum generic_icon_type guess_device_type(void) { + const char *type = getenv("ID_TYPE"); const char *bus = getenv("ID_BUS"); + if (type && streq(type, "cd")) + return ICON_TYPE_OPTICAL; if (streq(bus, "usb")) return ICON_TYPE_USB; if (streq(bus, "ata") || streq(bus, "scsi")) @@ -358,9 +377,138 @@ enum generic_icon_type guess_device_type(void) return ICON_TYPE_UNKNOWN; } -int main(int argc, char **argv) + +static int is_removable_device(const char *sysfs_path) +{ + char full_path[PATH_MAX]; + char buf[80]; + int fd, buf_len; + + 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); + if (fd < 0) + return 0; + buf_len = read(fd, buf, 79); + close(fd); + if (buf_len < 0) + return 0; + buf[buf_len] = 0; + return strtol(buf, NULL, 10); +} + +static int found_new_device(const char *dev_path) { char mountpoint[PATH_MAX]; + + if (mount_device(dev_path, mountpoint)) { + log("failed to mount %s\n", dev_path); + return EXIT_FAILURE; + } + + log("mounted %s at %s\n", dev_path, mountpoint); + + iterate_parsers(dev_path, mountpoint); + + return EXIT_SUCCESS; +} + +static int poll_device_plug(const char *dev_path, + int *optical) +{ + int rc, fd; + + /* Polling loop for optical drive */ + for (; (*optical) != 0; ) { + printf("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"); + break; + } + *optical = 1; + if (rc == CDS_DISC_OK) + return EXIT_SUCCESS; + + printf("no... waiting\n"); + sleep(REMOVABLE_SLEEP_DELAY); + } + + /* Fall back to bare open() */ + *optical = 0; + for (;;) { + printf("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); + } +} + +static int poll_device_unplug(const char *dev_path, int optical) +{ + int rc, fd; + + for (;optical;) { + printf("poll for optical drive removal ...\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 != CDS_DISC_OK) + return EXIT_SUCCESS; + printf("no... waiting\n"); + sleep(REMOVABLE_SLEEP_DELAY); + } + + /* Fall back to bare open() */ + for (;;) { + printf("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); + } +} + +static int poll_removable_device(const char *sysfs_path, + const char *dev_path) +{ + int rc, mounted, optical = -1; + + for (;;) { + rc = poll_device_plug(dev_path, &optical); + if (rc == EXIT_FAILURE) + return rc; + rc = found_new_device(dev_path); + mounted = (rc == EXIT_SUCCESS); + + poll_device_unplug(dev_path, optical); + + remove_device(dev_path); + + /* Unmount it repeatedly, if needs be */ + while (mounted && !unmount_device(dev_path)) + ; + sleep(1); + } +} + +int main(int argc, char **argv) +{ char *dev_path, *action; int rc; @@ -400,21 +548,19 @@ int main(int argc, char **argv) } if (streq(action, "add")) { - if (mount_device(dev_path, mountpoint)) { - log("failed to mount %s\n", dev_path); - return EXIT_FAILURE; - } - - log("mounted %s at %s\n", dev_path, mountpoint); - - iterate_parsers(dev_path, mountpoint); - + char *sysfs_path = getenv("DEVPATH"); + if (sysfs_path && is_removable_device(sysfs_path)) + rc = poll_removable_device(sysfs_path, dev_path); + else + rc = found_new_device(dev_path); } else if (streq(action, "remove")) { log("%s removed\n", dev_path); remove_device(dev_path); - unmount_device(dev_path); + /* Unmount it repeatedly, if needs be */ + while (!unmount_device(dev_path)) + ; } else { log("invalid action '%s'\n", action);