diff options
author | Lennart Poettering <lennart@poettering.net> | 2019-12-18 12:22:40 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2019-12-23 14:43:59 +0100 |
commit | d4dffb8533a038fd42da8aae00ed2b09495dedb0 (patch) | |
tree | 16d797db584eb3e67cc810848e12bdd42f44158f /src/gpt-auto-generator | |
parent | bash-completion: move shell-completion for log-level or friends to systemctl (diff) | |
download | systemd-d4dffb8533a038fd42da8aae00ed2b09495dedb0.tar.xz systemd-d4dffb8533a038fd42da8aae00ed2b09495dedb0.zip |
dissect: introduce new recognizable partition types for /var and /var/tmp
This has been requested many times before. Let's add it finally.
GPT auto-discovery for /var is a bit more complex than for other
partition types: the other partitions can to some degree be shared
between multiple OS installations on the same disk (think: swap, /home,
/srv). However, /var is inherently something bound to an installation,
i.e. specific to its identity, or actually *is* its identity, and hence
something that cannot be shared.
To deal with this this new code is particularly careful when it comes to
/var: it will not mount things blindly, but insist that the UUID of the
partition matches a hashed version of the machine-id of the
installation, so that each installation has a very specific /var
associated with it, and would never use any other. (We actually use
HMAC-SHA256 on the GPT partition type for /var, keyed by the machine-id,
since machine-id is something we want to keep somewhat private).
Setting the right UUID for installations takes extra care. To make
things a bit simpler to set up, we avoid this safety check for nspawn
and RootImage= in unit files, under the assumption that such container
and service images unlikely will have multiple installations on them.
The check is hence only required when booting full machines, i.e. in
in systemd-gpt-auto-generator.
To help with putting together images for full machines, PR #14368
introduces a repartition tool that can automatically fill in correctly
calculated UUIDs on first boot if images have the var partition UUID
initialized to all zeroes. With that in place systems can be put
together in a way that on first boot the machine ID is determined and
the partition table automatically adjusted to have the /var partition
with the right UUID.
Diffstat (limited to 'src/gpt-auto-generator')
-rw-r--r-- | src/gpt-auto-generator/gpt-auto-generator.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index 4aac903aa6..04691a62c4 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -697,6 +697,18 @@ static int enumerate_partitions(dev_t devnum) { r = k; } + if (m->partitions[PARTITION_VAR].found) { + k = add_partition_mount(m->partitions + PARTITION_VAR, "var", "/var", "Variable Data Partition"); + if (k < 0) + r = k; + } + + if (m->partitions[PARTITION_TMP].found) { + k = add_partition_mount(m->partitions + PARTITION_TMP, "var-tmp", "/var/tmp", "Temporary Data Partition"); + if (k < 0) + r = k; + } + if (m->partitions[PARTITION_ROOT].found) { k = add_root_rw(m->partitions + PARTITION_ROOT); if (k < 0) |