Fix check for null initrd and boot args

[petitboot] / devices / udev-helper.c

diff --git a/devices/udev-helper.c b/devices/udev-helper.c
index a55d3780906e15d5274fec996b2bf6ce8906bd5d..87a7fc19ab431827c15ec1615cd94a23b5b5d113 100644 (file)
--- a/devices/udev-helper.c
+++ b/devices/udev-helper.c
@@ -184,6 +184,97 @@ int connect_to_socket()
 #endif
 }
 
+static int mkdir_recursive(const char *dir)
+{
+       char *str, *sep;
+       int mode = 0755;
+       struct stat statbuf;
+
+       pb_log("mkdir_recursive(%s)\n", dir);
+
+       if (!*dir)
+               return 0;
+
+       if (!stat(dir, &statbuf)) {
+               if (!S_ISDIR(statbuf.st_mode)) {
+                       pb_log("%s: %s exists, but isn't a directory\n",
+                                       __func__, dir);
+                       return -1;
+               }
+               return 0;
+       }
+
+       str = strdup(dir);
+       sep = strchr(*str == '/' ? str + 1 : str, '/');
+
+       while (1) {
+
+               /* terminate the path at sep */
+               if (sep)
+                       *sep = '\0';
+               pb_log("mkdir(%s)\n", str);
+
+               if (mkdir(str, mode) && errno != EEXIST) {
+                       pb_log("mkdir(%s): %s\n", str, strerror(errno));
+                       return -1;
+               }
+
+               if (!sep)
+                       break;
+
+               /* reset dir to the full path */
+               strcpy(str, dir);
+               sep = strchr(sep + 1, '/');
+       }
+
+       free(str);
+
+       return 0;
+}
+
+static void setup_device_links(const char *device)
+{
+       struct link {
+               char *env, *dir;
+       } *link, links[] = {
+               {
+                       .env = "ID_FS_UUID",
+                       .dir = "disk/by-uuid"
+               },
+               {
+                       .env = "ID_FS_LABEL",
+                       .dir = "disk/by-label"
+               },
+               {
+                       .env = NULL
+               }
+       };
+
+       for (link = links; link->env; link++) {
+               char *value, *dir, *path;
+
+               value = getenv(link->env);
+               if (!value)
+                       continue;
+
+               value = encode_label(value);
+               dir = join_paths(TMP_DIR, link->dir);
+               path = join_paths(dir, value);
+
+               if (!mkdir_recursive(dir)) {
+                       unlink(path);
+                       if (symlink(mountpoint_for_device(device), path)) {
+                               pb_log("symlink(%s): %s\n",
+                                               path, strerror(errno));
+                       }
+               }
+
+               free(path);
+               free(dir);
+               free(value);
+       }
+}
+
 int mount_device(const char *dev_path)
 {
        const char *dir;
@@ -224,8 +315,10 @@ int mount_device(const char *dev_path)
                goto out;
        }
 
-       if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
+       if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
+               setup_device_links(dev_path);
                rc = 0;
+       }
 
 out:
        return rc;
@@ -337,7 +430,8 @@ static int is_removable_device(const char *sysfs_path)
 
 static int is_ignored_device(const char *devname)
 {
-       static const char *ignored_devices[] = { "/dev/ram", NULL };
+       static const char *ignored_devices[] =
+               { "/dev/ram", "/dev/loop", NULL };
        const char **dev;
 
        for (dev = ignored_devices; *dev; dev++)
@@ -395,35 +489,30 @@ static int poll_device_plug(const char *dev_path,
 
        /* 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");
+               if (rc == -1)
                        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);
        }
 }
@@ -433,7 +522,6 @@ 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;
@@ -441,20 +529,17 @@ static int poll_device_unplug(const char *dev_path, int optical)
                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);
        }
 }