899738e284
- Remove root-fsck.patch, mkinitrd will use the same path as dracut. - Add systemd-cryptsetup.patch: don't complain on "none" option in crypttab. - Add systemd-cryptsetup-query.patch: block boot until passphrase is typed. OBS-URL: https://build.opensuse.org/request/show/78055 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=51
26 lines
724 B
Diff
26 lines
724 B
Diff
From aa5f34f2109a02db7887c220c5a35b6a8ee3e6c8 Mon Sep 17 00:00:00 2001
|
|
From: Frederic Crozat <fcrozat@suse.com>
|
|
Date: Thu, 4 Aug 2011 16:04:43 +0200
|
|
Subject: [PATCH] cryptsetup: accept "none" option
|
|
|
|
---
|
|
src/cryptsetup.c | 2 +-
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/src/cryptsetup.c b/src/cryptsetup.c
|
|
index cf288de..ac7b6d6 100644
|
|
--- a/src/cryptsetup.c
|
|
+++ b/src/cryptsetup.c
|
|
@@ -110,7 +110,7 @@ static int parse_one_option(const char *option) {
|
|
return 0;
|
|
}
|
|
|
|
- } else
|
|
+ } else if (!streq(option, "none"))
|
|
log_error("Encountered unknown /etc/crypttab option '%s', ignoring.", option);
|
|
|
|
return 0;
|
|
--
|
|
1.7.3.4
|
|
|