From 62ca7d3b38dbbfbffa0aa0d3746b6be2916530b5 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 23 Sep 2020 15:23:58 -0400 Subject: [PATCH] cryptsetup-generator: use "/proc/cmdline" as source when appropriate Right now, we always say `/etc/crypttab` even if the source was fully derived from the kargs. Let's match what `systemd-fstab-generator` does and use `/proc/cmdline` when that's the case. --- src/cryptsetup/cryptsetup-generator.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index dec4d201814..9a1ddf2094f 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -274,7 +274,8 @@ static int create_disk( const char *device, const char *password, const char *keydev, - const char *options) { + const char *options, + const char *source) { _cleanup_free_ char *n = NULL, *d = NULL, *u = NULL, *e = NULL, *keydev_mount = NULL, *keyfile_timeout_value = NULL, @@ -343,7 +344,7 @@ static int create_disk( if (r < 0) return r; - r = generator_write_cryptsetup_unit_section(f, arg_crypttab); + r = generator_write_cryptsetup_unit_section(f, source); if (r < 0) return r; @@ -680,7 +681,7 @@ static int add_crypttab_devices(void) { if (r < 0) return r; - r = create_disk(name, device, keyfile, keydev, (d && d->options) ? d->options : options); + r = create_disk(name, device, keyfile, keydev, (d && d->options) ? d->options : options, arg_crypttab); if (r < 0) return r; @@ -715,7 +716,8 @@ static int add_proc_cmdline_devices(void) { device, d->keyfile ?: arg_default_keyfile, d->keydev, - d->options ?: arg_default_options); + d->options ?: arg_default_options, + "/proc/cmdline"); if (r < 0) return r; }