X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fgpt-auto-generator%2Fgpt-auto-generator.c;h=539e2e64b53b59568ee70c1de8d15223506e598c;hb=9ff5ff320ec71fec7f2c841223380665794afd07;hp=67d0f2a5b902603ed255a44dc050403a9c46739a;hpb=61331eab0a53cd9b8446eab6d1ebf1a046d8efc1;p=elogind.git diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index 67d0f2a5b..539e2e64b 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -44,15 +44,13 @@ #include "gpt.h" #include "fileio.h" #include "efivars.h" +#include "blkid-util.h" static const char *arg_dest = "/tmp"; static bool arg_enabled = true; static bool arg_root_enabled = true; static bool arg_root_rw = false; -DEFINE_TRIVIAL_CLEANUP_FUNC(blkid_probe, blkid_free_probe); -#define _cleanup_blkid_free_probe_ _cleanup_(blkid_free_probep) - static int add_swap(const char *path) { _cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL; _cleanup_fclose_ FILE *f = NULL; @@ -103,7 +101,7 @@ static int add_swap(const char *path) { 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; @@ -126,7 +124,7 @@ 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"); @@ -146,15 +144,14 @@ 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); @@ -225,7 +222,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) { @@ -242,7 +239,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; @@ -288,8 +285,7 @@ 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)) { @@ -316,6 +312,7 @@ static int probe_and_add_mount( const char *id, const char *what, const char *where, + bool rw, const char *description, const char *post) { @@ -367,7 +364,7 @@ static int probe_and_add_mount( what, where, fstype, - NULL, + rw, description, post); } @@ -383,6 +380,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; @@ -396,22 +394,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); @@ -429,8 +435,6 @@ static int enumerate_partitions(dev_t devnum) { 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); @@ -455,8 +459,10 @@ static int enumerate_partitions(dev_t devnum) { } /* 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); @@ -464,7 +470,7 @@ static int enumerate_partitions(dev_t devnum) { if (errno == 0) return log_oom(); - log_error("Failed to list of partitions of %s: %m", node); + log_error("Failed to list partitions of %s: %m", node); return -errno; } @@ -494,6 +500,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) @@ -517,6 +524,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; @@ -530,6 +544,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; @@ -541,6 +560,7 @@ static int enumerate_partitions(dev_t devnum) { continue; home_nr = nr; + home_rw = !(flags & GPT_FLAG_READ_ONLY), free(home); home = strdup(subnode); @@ -554,6 +574,7 @@ static int enumerate_partitions(dev_t devnum) { continue; srv_nr = nr; + srv_rw = !(flags & GPT_FLAG_READ_ONLY), free(srv); srv = strdup(node); @@ -563,13 +584,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; } @@ -673,8 +694,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; } @@ -704,10 +723,10 @@ static int add_root_mount(void) { return add_mount( "root", - "/dev/disk/by-id/gpt-auto-root", + "/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