Merge pull request #17154 from keszybz/crypttab-commas

Allow escaping commas in crypttab
This commit is contained in:
Lennart Poettering
2020-10-01 10:26:24 +02:00
committed by GitHub
13 changed files with 126 additions and 80 deletions
-6
View File
@@ -622,7 +622,6 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
static int add_crypttab_devices(void) {
_cleanup_fclose_ FILE *f = NULL;
unsigned crypttab_line = 0;
struct stat st;
int r;
if (!arg_read_crypttab)
@@ -635,11 +634,6 @@ static int add_crypttab_devices(void) {
return 0;
}
if (fstat(fileno(f), &st) < 0) {
log_error_errno(errno, "Failed to stat %s: %m", arg_crypttab);
return 0;
}
for (;;) {
_cleanup_free_ char *line = NULL, *name = NULL, *device = NULL, *keyspec = NULL, *options = NULL, *keyfile = NULL, *keydev = NULL;
crypto_device *d = NULL;