Attachment 851942 Details for Bug 1012899 – add support for older option for crypsetup generator

[patch] add support for older option for crypsetup generator

0001-Add-support-for-option-rd_LUKS_UUID-since-it-is-stil.patch (text/plain), 1.19 KB, created by Michael S. on 2014-01-18 09:40:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael S.

Created: 2014-01-18 09:40:37 UTC

Size: 1.19 KB

patch

obsolete

>From 7c6aec787bda64eb242972d373bc334343e9ec82 Mon Sep 17 00:00:00 2001
>From: Michael Scherer <misc@zarb.org>
>Date: Sat, 18 Jan 2014 10:29:55 +0100
>Subject: [PATCH] Add support for option rd_LUKS_UUID, since it is still used
> sometime (RHBZ#1012899)
>
>While the option should be deprecated at some point, it shouldn't be deprecated
>silently, and the support of dracut and systemd should be kept in sync if possible.
>---
> src/cryptsetup/cryptsetup-generator.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
>index 9c98f0b..a471264 100644
>--- a/src/cryptsetup/cryptsetup-generator.c
>+++ b/src/cryptsetup/cryptsetup-generator.c
>@@ -301,7 +301,7 @@ static int parse_proc_cmdline(
>                         if (strv_extend(arg_proc_cmdline_disks, word + 10) < 0)
>                                 return log_oom();
> 
>-                } else if (startswith(word, "rd.luks.uuid=")) {
>+                } else if (startswith(word, "rd.luks.uuid=") || startswith(word, "rd_LUKS_UUID=")) {
> 
>                         if (in_initrd()) {
>                                 if (strv_extend(arg_proc_cmdline_disks, word + 13) < 0)
>-- 
>1.8.4.2
>

Actions: View | Diff

Attachments on bug 1012899: 803891 | 851941 | 851942