summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2013-04-11 15:44:33 +0200
committerLennart Poettering <lennart@poettering.net>2013-04-18 02:45:01 +0200
commit951657bd0a5bb32b5f56cc6b91ad2ea4094bdfaf (patch)
tree6bfa3c0784b1ee49361265bfd1133e975e8a403f /src
parent8b95c916386eff949d5a8abadf82cda09799794f (diff)
cryptsetup-generator: add support for rd.luks.key=
Also clarify rd.luks.uuid and luks.uuid in the manual. https://bugzilla.redhat.com/show_bug.cgi?id=905683
Diffstat (limited to 'src')
-rw-r--r--src/cryptsetup/cryptsetup-generator.c22
1 files changed, 19 insertions, 3 deletions
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index fd2080b539..fd634ae74c 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -233,7 +233,7 @@ static int create_disk(
return 0;
}
-static int parse_proc_cmdline(char ***arg_proc_cmdline_disks) {
+static int parse_proc_cmdline(char ***arg_proc_cmdline_disks, char **arg_proc_cmdline_keyfile) {
char _cleanup_free_ *line = NULL;
char *w = NULL, *state = NULL;
int r;
@@ -300,6 +300,21 @@ static int parse_proc_cmdline(char ***arg_proc_cmdline_disks) {
return log_oom();
}
+ } else if (startswith(word, "luks.key=")) {
+ *arg_proc_cmdline_keyfile = strdup(word + 9);
+ if (! arg_proc_cmdline_keyfile)
+ return log_oom();
+
+ } else if (startswith(word, "rd.luks.key=")) {
+
+ if (in_initrd()) {
+ if (*arg_proc_cmdline_keyfile)
+ free(*arg_proc_cmdline_keyfile);
+ *arg_proc_cmdline_keyfile = strdup(word + 12);
+ if (!arg_proc_cmdline_keyfile)
+ return log_oom();
+ }
+
} else if (startswith(word, "luks.") ||
(in_initrd() && startswith(word, "rd.luks."))) {
@@ -319,6 +334,7 @@ int main(int argc, char *argv[]) {
char **i;
char _cleanup_strv_free_ **arg_proc_cmdline_disks_done = NULL;
char _cleanup_strv_free_ **arg_proc_cmdline_disks = NULL;
+ char _cleanup_free_ *arg_proc_cmdline_keyfile = NULL;
if (argc > 1 && argc != 4) {
log_error("This program takes three or no arguments.");
@@ -334,7 +350,7 @@ int main(int argc, char *argv[]) {
umask(0022);
- if (parse_proc_cmdline(&arg_proc_cmdline_disks) < 0)
+ if (parse_proc_cmdline(&arg_proc_cmdline_disks, &arg_proc_cmdline_keyfile) < 0)
return EXIT_FAILURE;
if (!arg_enabled)
@@ -425,7 +441,7 @@ int main(int argc, char *argv[]) {
if (!name || !device)
return log_oom();
- if (create_disk(name, device, NULL, "timeout=0") < 0)
+ if (create_disk(name, device, arg_proc_cmdline_keyfile, "timeout=0") < 0)
r = EXIT_FAILURE;
}