]> git.ozlabs.org Git - petitboot/blobdiff - devices/udev-helper.c
Fix another bogon in log()
[petitboot] / devices / udev-helper.c
index f9360860e4c8955813a741fbd5444646bbb819ce..4ec054b38411ad8e053a2f3171de89dc2e865e84 100644 (file)
@@ -1,6 +1,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <stdint.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <string.h>
 #include <asm/byteorder.h>
+#include <linux/cdrom.h>
+#include <sys/ioctl.h>
 
-#include "udev-helper.h"
+#include "parser.h"
+#include "petitboot-paths.h"
 
-#define parser_dir "."
+/* Define below to operate without the frontend */
+#undef USE_FAKE_SOCKET
 
-#define tmp_dir "/var/tmp/petitboot"
-#define socket_file "/var/tmp/petitboot-dev"
-#define mount_bin "/bin/mount"
-#define umount_bin "/bin/umount"
+/* Delay in seconds between polling of removable devices */
+#define REMOVABLE_SLEEP_DELAY  2
 
-extern struct parser native_parser;
 static FILE *logf;
 static int sock;
 
-/* array of parsers, ordered by priority */
-static struct parser *parsers[] = {
-       &native_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("\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->name);
-       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)
@@ -115,7 +69,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;
@@ -123,20 +77,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;
@@ -150,7 +104,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) ||
@@ -159,7 +113,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;
 }
@@ -168,7 +122,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) ||
@@ -181,7 +135,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;
 }
@@ -194,21 +148,21 @@ int remove_device(const char *dev_path)
 
 int connect_to_socket()
 {
-#if 1
+#ifndef USE_FAKE_SOCKET
        int fd;
        struct sockaddr_un addr;
 
        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;
        }
 
        addr.sun_family = AF_UNIX;
-       strcpy(addr.sun_path, socket_file);
+       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;
        }
@@ -219,7 +173,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;
@@ -227,36 +181,42 @@ 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",
-                               tmp_dir, strerror(errno));
+               pb_log("failed to create temporary directory in %s: %s",
+                               TMP_DIR, strerror(errno));
                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;
        }
 
        if (pid == 0) {
-               execl(mount_bin, mount_bin, dev_path, dir, "-o", "ro", NULL);
+               execl(MOUNT_BIN, MOUNT_BIN, dev_path, dir, "-o", "ro", NULL);
                exit(EXIT_FAILURE);
        }
 
        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;
        }
 
@@ -277,17 +237,18 @@ 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;
        }
 
        if (pid == 0) {
-               execl(umount_bin, umount_bin, dev_path, NULL);
+               execl(UMOUNT_BIN, UMOUNT_BIN, dev_path, NULL);
                exit(EXIT_FAILURE);
        }
 
        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;
        }
 
@@ -296,33 +257,17 @@ 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/hdd.png";
-       case ICON_TYPE_USB:
-               return "artwork/usbpen.png";
-       case ICON_TYPE_OPTICAL:
-               return "artwork/cdrom.png";
-       case ICON_TYPE_NETWORK:
-       case ICON_TYPE_UNKNOWN:
-               break;
-       }
-       return "artwork/hdd.png";
-}
-
 static const struct device fake_boot_devices[] =
 {
        {
                .id             = "fakeDisk0",
                .name           = "Hard Disk",
-               .icon_file      = "artwork/hdd.png",
+               .icon_file      = artwork_pathname("hdd.png"),
        },
        {
                .id             = "fakeDisk1",
                .name           = "PinkCat Linux CD",
-               .icon_file      = "artwork/cdrom.png",
+               .icon_file      = artwork_pathname("cdrom.png"),
        }
 };
 
@@ -332,31 +277,36 @@ static const struct boot_option fake_boot_options[] =
                .id             = "fakeBoot0",
                .name           = "Bloobuntu Linux",
                .description    = "Boot Bloobuntu Linux",
-               .icon_file      = "artwork/hdd.png",
+               .icon_file      = artwork_pathname("hdd.png"),
        },
        {
                .id             = "fakeBoot1",
                .name           = "Pendora Gore 6",
                .description    = "Boot Pendora Gora 6",
-               .icon_file      = "artwork/hdd.png",
+               .icon_file      = artwork_pathname("hdd.png"),
        },
        {
                .id             = "fakeBoot2",
                .name           = "Genfoo Minux",
                .description    = "Boot Genfoo Minux",
-               .icon_file      = "artwork/hdd.png",
+               .icon_file      = artwork_pathname("hdd.png"),
        },
        {
                .id             = "fakeBoot3",
                .name           = "PinkCat Linux",
                .description    = "Install PinkCat Linux - Graphical install",
-               .icon_file      = "artwork/cdrom.png",
+               .icon_file      = artwork_pathname("cdrom.png"),
        },
 };
 
 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 (!bus)
+               return ICON_TYPE_UNKNOWN;
        if (streq(bus, "usb"))
                return ICON_TYPE_USB;
        if (streq(bus, "ata") || streq(bus, "scsi"))
@@ -364,22 +314,188 @@ 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);
+       pb_log(" -> 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 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];
+
+       if (mount_device(dev_path, mountpoint)) {
+               pb_log("failed to mount %s\n", dev_path);
+               return EXIT_FAILURE;
+       }
+
+       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)
+{
+       int rc, fd;
+
+       /* Polling loop for optical drive */
+       for (; (*optical) != 0; ) {
+               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) {
+                       pb_log("not an optical drive, fallback...\n");
+                       break;
+               }
+               *optical = 1;
+               if (rc == CDS_DISC_OK)
+                       return EXIT_SUCCESS;
+
+               pb_log("no... waiting\n");
+               detach_and_sleep(REMOVABLE_SLEEP_DELAY);
+       }
+
+       /* Fall back to bare open() */
+       *optical = 0;
+       for (;;) {
+               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;
+               pb_log("no... waiting\n");
+               detach_and_sleep(REMOVABLE_SLEEP_DELAY);
+       }
+}
+
+static int poll_device_unplug(const char *dev_path, int optical)
+{
+       int rc, fd;
+
+       for (;optical;) {
+               pb_log("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;
+               pb_log("no... waiting\n");
+               detach_and_sleep(REMOVABLE_SLEEP_DELAY);
+       }
+
+       /* Fall back to bare open() */
+       for (;;) {
+               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;
+               pb_log("no... waiting\n");
+               detach_and_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))
+                       ;
+               detach_and_sleep(1);
+       }
+}
+
+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;
        }
 
@@ -387,7 +503,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]);
@@ -401,29 +517,30 @@ 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 (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);
+       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))
+                       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);
+               pb_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);
+               pb_log("invalid action '%s'\n", action);
                rc = EXIT_FAILURE;
        }
        return rc;