mirror of
https://github.com/systemd/systemd
synced 2024-10-15 12:34:37 +00:00
cryptsetup-generator: Add support for header device in crypttab
This commit is contained in:
parent
a8574d0055
commit
13445d9775
|
@ -112,7 +112,12 @@
|
||||||
relevant for LUKS devices. See
|
relevant for LUKS devices. See
|
||||||
<citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
|
<citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
|
||||||
for possible values and the default value of this
|
for possible values and the default value of this
|
||||||
option.</para></listitem>
|
option.</para>
|
||||||
|
|
||||||
|
<para>Optionally, the path may be followed by <literal>:</literal> and an fstab device specification
|
||||||
|
(e.g. starting with <literal>UUID=</literal> or similar); in which case, the path is relative to the
|
||||||
|
device file system root. The device gets mounted automatically for LUKS device activation duration only.
|
||||||
|
</para></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
|
|
|
@ -789,7 +789,8 @@ static int add_crypttab_devices(void) {
|
||||||
}
|
}
|
||||||
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
_cleanup_free_ char *line = NULL, *name = NULL, *device = NULL, *keyspec = NULL, *options = NULL, *keyfile = NULL, *keydev = NULL;
|
_cleanup_free_ char *line = NULL, *name = NULL, *device = NULL, *keyspec = NULL, *options = NULL,
|
||||||
|
*keyfile = NULL, *keydev = NULL, *headerdev = NULL, *filtered_header = NULL;
|
||||||
crypto_device *d = NULL;
|
crypto_device *d = NULL;
|
||||||
char *l, *uuid;
|
char *l, *uuid;
|
||||||
int k;
|
int k;
|
||||||
|
@ -829,7 +830,20 @@ static int add_crypttab_devices(void) {
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return r;
|
return r;
|
||||||
|
|
||||||
r = create_disk(name, device, keyfile, keydev, d ? d->headerdev : NULL, (d && d->options) ? d->options : options, arg_crypttab);
|
if (options && (!d || !d->options)) {
|
||||||
|
r = filter_header_device(options, &headerdev, &filtered_header);
|
||||||
|
if (r < 0)
|
||||||
|
return r;
|
||||||
|
free_and_replace(options, filtered_header);
|
||||||
|
}
|
||||||
|
|
||||||
|
r = create_disk(name,
|
||||||
|
device,
|
||||||
|
keyfile,
|
||||||
|
keydev,
|
||||||
|
(d && d->options) ? d->headerdev : headerdev,
|
||||||
|
(d && d->options) ? d->options : options,
|
||||||
|
arg_crypttab);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return r;
|
return r;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue