X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fgpt-auto-generator%2Fgpt-auto-generator.c;h=5c58b58f8a35c3144ba7d59234b48efcb6df7407;hp=e487f64386892d4e0917c918a711c3369e0c49e8;hb=63c372cb9df3bee01e3bf8cd7f96f336bddda846;hpb=98b2f766b24c84fc49a4df954717b1f96bbce00d

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index e487f6438..5c58b58f8 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -26,10 +26,6 @@
 #include <sys/statfs.h>
 #include <blkid/blkid.h>
 
-#ifdef HAVE_LINUX_BTRFS_H
-#include <linux/btrfs.h>
-#endif
-
 #include "sd-id128.h"
 #include "libudev.h"
 #include "path-util.h"
@@ -45,6 +41,7 @@
 #include "fileio.h"
 #include "efivars.h"
 #include "blkid-util.h"
+#include "btrfs-util.h"
 
 static const char *arg_dest = "/tmp";
 static bool arg_enabled = true;
@@ -68,10 +65,8 @@ static int add_swap(const char *path) {
                 return log_oom();
 
         f = fopen(unit, "wxe");
-        if (!f) {
-                log_error("Failed to create unit file %s: %m", unit);
-                return -errno;
-        }
+        if (!f)
+                return log_error_errno(errno, "Failed to create unit file %s: %m", unit);
 
         fprintf(f,
                 "# Automatically generated by systemd-gpt-auto-generator\n\n"
@@ -83,25 +78,21 @@ static int add_swap(const char *path) {
                 path);
 
         fflush(f);
-        if (ferror(f)) {
-                log_error("Failed to write unit file %s: %m", unit);
-                return -errno;
-        }
+        if (ferror(f))
+                return log_error_errno(errno, "Failed to write unit file %s: %m", unit);
 
         lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL);
         if (!lnk)
                 return log_oom();
 
         mkdir_parents_label(lnk, 0755);
-        if (symlink(unit, lnk) < 0) {
-                log_error("Failed to create symlink %s: %m", lnk);
-                return -errno;
-        }
+        if (symlink(unit, lnk) < 0)
+                return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
 
         return 0;
 }
 
-static int add_cryptsetup(const char *id, const char *what, char **device) {
+static int add_cryptsetup(const char *id, const char *what, bool rw, char **device) {
         _cleanup_free_ char *e = NULL, *n = NULL, *p = NULL, *d = NULL, *to = NULL;
         _cleanup_fclose_ FILE *f = NULL;
         char *from, *ret;
@@ -124,14 +115,12 @@ static int add_cryptsetup(const char *id, const char *what, char **device) {
                 return log_oom();
 
         p = strjoin(arg_dest, "/", n, NULL);
-        if (!n)
+        if (!p)
                 return log_oom();
 
         f = fopen(p, "wxe");
-        if (!f) {
-                log_error("Failed to create unit file %s: %m", p);
-                return -errno;
-        }
+        if (!f)
+                return log_error_errno(errno, "Failed to create unit file %s: %m", p);
 
         fprintf(f,
                 "# Automatically generated by systemd-gpt-auto-generator\n\n"
@@ -144,34 +133,29 @@ static int add_cryptsetup(const char *id, const char *what, char **device) {
                 "Before=umount.target cryptsetup.target\n"
                 "After=%s\n"
                 "IgnoreOnIsolate=true\n"
-                "After=systemd-readahead-collect.service systemd-readahead-replay.service\n\n"
                 "[Service]\n"
                 "Type=oneshot\n"
                 "RemainAfterExit=yes\n"
                 "TimeoutSec=0\n" /* the binary handles timeouts anyway */
-                "ExecStart=" SYSTEMD_CRYPTSETUP_PATH " attach '%s' '%s'\n"
+                "ExecStart=" SYSTEMD_CRYPTSETUP_PATH " attach '%s' '%s' '' '%s'\n"
                 "ExecStop=" SYSTEMD_CRYPTSETUP_PATH " detach '%s'\n",
                 d, d,
-                id, what,
+                id, what, rw ? "" : "read-only",
                 id);
 
         fflush(f);
-        if (ferror(f)) {
-                log_error("Failed to write file %s: %m", p);
-                return -errno;
-        }
+        if (ferror(f))
+                return log_error_errno(errno, "Failed to write file %s: %m", p);
 
-        from = strappenda("../", n);
+        from = strjoina("../", n);
 
         to = strjoin(arg_dest, "/", d, ".wants/", n, NULL);
         if (!to)
                 return log_oom();
 
         mkdir_parents_label(to, 0755);
-        if (symlink(from, to) < 0) {
-                log_error("Failed to create symlink %s: %m", to);
-                return -errno;
-        }
+        if (symlink(from, to) < 0)
+                return log_error_errno(errno, "Failed to create symlink %s: %m", to);
 
         free(to);
         to = strjoin(arg_dest, "/cryptsetup.target.requires/", n, NULL);
@@ -179,10 +163,8 @@ static int add_cryptsetup(const char *id, const char *what, char **device) {
                 return log_oom();
 
         mkdir_parents_label(to, 0755);
-        if (symlink(from, to) < 0) {
-                log_error("Failed to create symlink %s: %m", to);
-                return -errno;
-        }
+        if (symlink(from, to) < 0)
+                return log_error_errno(errno, "Failed to create symlink %s: %m", to);
 
         free(to);
         to = strjoin(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL);
@@ -190,10 +172,8 @@ static int add_cryptsetup(const char *id, const char *what, char **device) {
                 return log_oom();
 
         mkdir_parents_label(to, 0755);
-        if (symlink(from, to) < 0) {
-                log_error("Failed to create symlink %s: %m", to);
-                return -errno;
-        }
+        if (symlink(from, to) < 0)
+                return log_error_errno(errno, "Failed to create symlink %s: %m", to);
 
         free(p);
         p = strjoin(arg_dest, "/dev-mapper-", e, ".device.d/50-job-timeout-sec-0.conf", NULL);
@@ -205,10 +185,8 @@ static int add_cryptsetup(const char *id, const char *what, char **device) {
                         "# Automatically generated by systemd-gpt-auto-generator\n\n"
                         "[Unit]\n"
                         "JobTimeoutSec=0\n"); /* the binary handles timeouts anyway */
-        if (r < 0) {
-                log_error("Failed to write device drop-in: %s", strerror(-r));
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to write device drop-in: %m");
 
         ret = strappend("/dev/mapper/", id);
         if (!ret)
@@ -223,7 +201,7 @@ static int add_mount(
                 const char *what,
                 const char *where,
                 const char *fstype,
-                const char *options,
+                bool rw,
                 const char *description,
                 const char *post) {
 
@@ -240,7 +218,7 @@ static int add_mount(
 
         if (streq_ptr(fstype, "crypto_LUKS")) {
 
-                r = add_cryptsetup(id, what, &crypto_what);
+                r = add_cryptsetup(id, what, rw, &crypto_what);
                 if (r < 0)
                         return r;
 
@@ -257,10 +235,8 @@ static int add_mount(
                 return log_oom();
 
         f = fopen(p, "wxe");
-        if (!f) {
-                log_error("Failed to create unit file %s: %m", unit);
-                return -errno;
-        }
+        if (!f)
+                return log_error_errno(errno, "Failed to create unit file %s: %m", unit);
 
         fprintf(f,
                 "# Automatically generated by systemd-gpt-auto-generator\n\n"
@@ -286,14 +262,11 @@ static int add_mount(
         if (fstype)
                 fprintf(f, "Type=%s\n", fstype);
 
-        if (options)
-                fprintf(f, "Options=%s\n", options);
+        fprintf(f, "Options=%s\n", rw ? "rw" : "ro");
 
         fflush(f);
-        if (ferror(f)) {
-                log_error("Failed to write unit file %s: %m", p);
-                return -errno;
-        }
+        if (ferror(f))
+                return log_error_errno(errno, "Failed to write unit file %s: %m", p);
 
         if (post) {
                 lnk = strjoin(arg_dest, "/", post, ".requires/", unit, NULL);
@@ -301,10 +274,8 @@ static int add_mount(
                         return log_oom();
 
                 mkdir_parents_label(lnk, 0755);
-                if (symlink(p, lnk) < 0) {
-                        log_error("Failed to create symlink %s: %m", lnk);
-                        return -errno;
-                }
+                if (symlink(p, lnk) < 0)
+                        return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
         }
 
         return 0;
@@ -314,6 +285,7 @@ static int probe_and_add_mount(
                 const char *id,
                 const char *what,
                 const char *where,
+                bool rw,
                 const char *description,
                 const char *post) {
 
@@ -340,7 +312,7 @@ static int probe_and_add_mount(
         if (!b) {
                 if (errno == 0)
                         return log_oom();
-                log_error("Failed to allocate prober: %m");
+                log_error_errno(errno, "Failed to allocate prober: %m");
                 return -errno;
         }
 
@@ -354,7 +326,7 @@ static int probe_and_add_mount(
         else if (r != 0) {
                 if (errno == 0)
                         errno = EIO;
-                log_error("Failed to probe %s: %m", what);
+                log_error_errno(errno, "Failed to probe %s: %m", what);
                 return -errno;
         }
 
@@ -365,7 +337,7 @@ static int probe_and_add_mount(
                         what,
                         where,
                         fstype,
-                        NULL,
+                        rw,
                         description,
                         post);
 }
@@ -381,6 +353,7 @@ static int enumerate_partitions(dev_t devnum) {
         struct udev_device *parent = NULL;
         const char *node, *pttype, *devtype;
         int home_nr = -1, srv_nr = -1;
+        bool home_rw = true, srv_rw = true;
         blkid_partlist pl;
         int r, k;
         dev_t pn;
@@ -394,22 +367,30 @@ static int enumerate_partitions(dev_t devnum) {
                 return log_oom();
 
         parent = udev_device_get_parent(d);
-        if (!parent)
-                return log_oom();
+        if (!parent) {
+                log_debug("Not a partitioned device, ignoring.");
+                return 0;
+        }
 
         /* Does it have a devtype? */
         devtype = udev_device_get_devtype(parent);
-        if (!devtype)
+        if (!devtype) {
+                log_debug("Parent doesn't have a device type, ignoring.");
                 return 0;
+        }
 
         /* Is this a disk or a partition? We only care for disks... */
-        if (!streq(devtype, "disk"))
+        if (!streq(devtype, "disk")) {
+                log_debug("Parent isn't a raw disk, ignoring.");
                 return 0;
+        }
 
         /* Does it have a device node? */
         node = udev_device_get_devnode(parent);
-        if (!node)
+        if (!node) {
+                log_debug("Parent device does not have device node, ignoring.");
                 return 0;
+        }
 
         log_debug("Root device %s.", node);
 
@@ -423,12 +404,10 @@ static int enumerate_partitions(dev_t devnum) {
                 if (errno == 0)
                         return log_oom();
 
-                log_error("Failed allocate prober: %m");
+                log_error_errno(errno, "Failed allocate prober: %m");
                 return -errno;
         }
 
-        blkid_probe_enable_superblocks(b, 1);
-        blkid_probe_set_superblocks_flags(b, BLKID_SUBLKS_TYPE);
         blkid_probe_enable_partitions(b, 1);
         blkid_probe_set_partitions_flags(b, BLKID_PARTS_ENTRY_DETAILS);
 
@@ -439,7 +418,7 @@ static int enumerate_partitions(dev_t devnum) {
         else if (r != 0) {
                 if (errno == 0)
                         errno = EIO;
-                log_error("Failed to probe %s: %m", node);
+                log_error_errno(errno, "Failed to probe %s: %m", node);
                 return -errno;
         }
 
@@ -448,13 +427,15 @@ static int enumerate_partitions(dev_t devnum) {
         if (r != 0) {
                 if (errno == 0)
                         errno = EIO;
-                log_error("Failed to determine partition table type of %s: %m", node);
+                log_error_errno(errno, "Failed to determine partition table type of %s: %m", node);
                 return -errno;
         }
 
         /* We only do this all for GPT... */
-        if (!streq_ptr(pttype, "gpt"))
+        if (!streq_ptr(pttype, "gpt")) {
+                log_debug("Not a GPT partition table, ignoring.");
                 return 0;
+        }
 
         errno = 0;
         pl = blkid_probe_get_partitions(b);
@@ -462,7 +443,7 @@ static int enumerate_partitions(dev_t devnum) {
                 if (errno == 0)
                         return log_oom();
 
-                log_error("Failed to list partitions of %s: %m", node);
+                log_error_errno(errno, "Failed to list partitions of %s: %m", node);
                 return -errno;
         }
 
@@ -479,10 +460,8 @@ static int enumerate_partitions(dev_t devnum) {
                 return log_oom();
 
         r = udev_enumerate_scan_devices(e);
-        if (r < 0) {
-                log_error("Failed to enumerate partitions on %s: %s", node, strerror(-r));
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to enumerate partitions on %s: %m", node);
 
         first = udev_enumerate_get_list_entry(e);
         udev_list_entry_foreach(item, first) {
@@ -492,6 +471,7 @@ static int enumerate_partitions(dev_t devnum) {
                 blkid_partition pp;
                 dev_t qn;
                 int nr;
+                unsigned long long flags;
 
                 q = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item));
                 if (!q)
@@ -515,6 +495,13 @@ static int enumerate_partitions(dev_t devnum) {
                 if (!pp)
                         continue;
 
+                flags = blkid_partition_get_flags(pp);
+
+                /* Ignore partitions that are not marked for automatic
+                 * mounting on discovery */
+                if (flags & GPT_FLAG_NO_AUTO)
+                        continue;
+
                 nr = blkid_partition_get_partno(pp);
                 if (nr < 0)
                         continue;
@@ -528,6 +515,11 @@ static int enumerate_partitions(dev_t devnum) {
 
                 if (sd_id128_equal(type_id, GPT_SWAP)) {
 
+                        if (flags & GPT_FLAG_READ_ONLY) {
+                                log_debug("%s marked as read-only swap partition, which is bogus, ignoring.", subnode);
+                                continue;
+                        }
+
                         k = add_swap(subnode);
                         if (k < 0)
                                 r = k;
@@ -539,6 +531,7 @@ static int enumerate_partitions(dev_t devnum) {
                                 continue;
 
                         home_nr = nr;
+                        home_rw = !(flags & GPT_FLAG_READ_ONLY),
 
                         free(home);
                         home = strdup(subnode);
@@ -552,6 +545,7 @@ static int enumerate_partitions(dev_t devnum) {
                                 continue;
 
                         srv_nr = nr;
+                        srv_rw = !(flags & GPT_FLAG_READ_ONLY),
 
                         free(srv);
                         srv = strdup(node);
@@ -561,13 +555,13 @@ static int enumerate_partitions(dev_t devnum) {
         }
 
         if (home) {
-                k = probe_and_add_mount("home", home, "/home", "Home Partition", SPECIAL_LOCAL_FS_TARGET);
+                k = probe_and_add_mount("home", home, "/home", home_rw, "Home Partition", SPECIAL_LOCAL_FS_TARGET);
                 if (k < 0)
                         r = k;
         }
 
         if (srv) {
-                k = probe_and_add_mount("srv", srv, "/srv", "Server Data Partition", SPECIAL_LOCAL_FS_TARGET);
+                k = probe_and_add_mount("srv", srv, "/srv", srv_rw, "Server Data Partition", SPECIAL_LOCAL_FS_TARGET);
                 if (k < 0)
                         r = k;
         }
@@ -575,54 +569,6 @@ static int enumerate_partitions(dev_t devnum) {
         return r;
 }
 
-static int get_btrfs_block_device(const char *path, dev_t *dev) {
-        struct btrfs_ioctl_fs_info_args fsi = {};
-        _cleanup_close_ int fd = -1;
-        uint64_t id;
-
-        assert(path);
-        assert(dev);
-
-        fd = open(path, O_DIRECTORY|O_CLOEXEC);
-        if (fd < 0)
-                return -errno;
-
-        if (ioctl(fd, BTRFS_IOC_FS_INFO, &fsi) < 0)
-                return -errno;
-
-        /* We won't do this for btrfs RAID */
-        if (fsi.num_devices != 1)
-                return 0;
-
-        for (id = 1; id <= fsi.max_id; id++) {
-                struct btrfs_ioctl_dev_info_args di = {
-                        .devid = id,
-                };
-                struct stat st;
-
-                if (ioctl(fd, BTRFS_IOC_DEV_INFO, &di) < 0) {
-                        if (errno == ENODEV)
-                                continue;
-
-                        return -errno;
-                }
-
-                if (stat((char*) di.path, &st) < 0)
-                        return -errno;
-
-                if (!S_ISBLK(st.st_mode))
-                        return -ENODEV;
-
-                if (major(st.st_rdev) == 0)
-                        return -ENODEV;
-
-                *dev = st.st_rdev;
-                return 1;
-        }
-
-        return -ENODEV;
-}
-
 static int get_block_device(const char *path, dev_t *dev) {
         struct stat st;
         struct statfs sfs;
@@ -642,7 +588,7 @@ static int get_block_device(const char *path, dev_t *dev) {
                 return -errno;
 
         if (F_TYPE_EQUAL(sfs.f_type, BTRFS_SUPER_MAGIC))
-                return get_btrfs_block_device(path, dev);
+                return btrfs_get_block_device(path, dev);
 
         return 0;
 }
@@ -657,8 +603,8 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
                 r = parse_boolean(value);
                 if (r < 0)
                         log_warning("Failed to parse gpt-auto switch %s. Ignoring.", value);
-
-                arg_enabled = r;
+                else
+                        arg_enabled = r;
 
         } else if (streq(key, "root") && value) {
 
@@ -671,8 +617,6 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
                 arg_root_rw = true;
         else if (streq(key, "ro") && !value)
                 arg_root_rw = false;
-        else if (startswith(key, "systemd.gpt-auto.") || startswith(key, "rd.systemd.gpt-auto."))
-                log_warning("Unknown kernel switch %s. Ignoring.", key);
 
         return 0;
 }
@@ -691,10 +635,8 @@ static int add_root_mount(void) {
         if (r == -ENOENT) {
                 log_debug("EFI loader partition unknown, exiting.");
                 return 0;
-        } else if (r < 0) {
-                log_error("Failed to read ESP partition UUID: %s", strerror(-r));
-                return r;
-        }
+        } else if (r < 0)
+                return log_error_errno(r, "Failed to read ESP partition UUID: %m");
 
         /* OK, we have an ESP partition, this is fantastic, so let's
          * wait for a root device to show up. A udev rule will create
@@ -705,7 +647,7 @@ static int add_root_mount(void) {
                         "/dev/gpt-auto-root",
                         in_initrd() ? "/sysroot" : "/",
                         NULL,
-                        arg_root_rw ? "rw" : "ro",
+                        arg_root_rw,
                         "Root Partition",
                         in_initrd() ? SPECIAL_INITRD_ROOT_FS_TARGET : SPECIAL_LOCAL_FS_TARGET);
 #else
@@ -718,10 +660,9 @@ static int add_mounts(void) {
         int r;
 
         r = get_block_device("/", &devno);
-        if (r < 0) {
-                log_error("Failed to determine block device of root file system: %s", strerror(-r));
-                return r;
-        } else if (r == 0) {
+        if (r < 0)
+                return log_error_errno(r, "Failed to determine block device of root file system: %m");
+        else if (r == 0) {
                 log_debug("Root file system not on a (single) block device.");
                 return 0;
         }
@@ -751,8 +692,9 @@ int main(int argc, char *argv[]) {
                 return EXIT_SUCCESS;
         }
 
-        if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
-                return EXIT_FAILURE;
+        r = parse_proc_cmdline(parse_proc_cmdline_item);
+        if (r < 0)
+                log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
 
         if (!arg_enabled) {
                 log_debug("Disabled, exiting.");