chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: use log_*_errno whenever %m is in the format string
[elogind.git]
/
src
/
cryptsetup
/
cryptsetup-generator.c
diff --git
a/src/cryptsetup/cryptsetup-generator.c
b/src/cryptsetup/cryptsetup-generator.c
index c7f30f6a156cc334216545d2ab90ba85afc09d2a..b27223cd6c235765bd4559dc1479a14a089d2bcd 100644
(file)
--- a/
src/cryptsetup/cryptsetup-generator.c
+++ b/
src/cryptsetup/cryptsetup-generator.c
@@
-117,7
+117,7
@@
static int create_disk(
f = fopen(p, "wxe");
if (!f) {
f = fopen(p, "wxe");
if (!f) {
- log_error
(
"Failed to create unit file %s: %m", p);
+ log_error
_errno(errno,
"Failed to create unit file %s: %m", p);
return -errno;
}
return -errno;
}
@@
-201,7
+201,7
@@
static int create_disk(
fflush(f);
if (ferror(f)) {
fflush(f);
if (ferror(f)) {
- log_error
(
"Failed to write file %s: %m", p);
+ log_error
_errno(errno,
"Failed to write file %s: %m", p);
return -errno;
}
return -errno;
}
@@
-215,7
+215,7
@@
static int create_disk(
mkdir_parents_label(to, 0755);
if (symlink(from, to) < 0) {
mkdir_parents_label(to, 0755);
if (symlink(from, to) < 0) {
- log_error
(
"Failed to create symlink %s: %m", to);
+ log_error
_errno(errno,
"Failed to create symlink %s: %m", to);
return -errno;
}
return -errno;
}
@@
-229,7
+229,7
@@
static int create_disk(
mkdir_parents_label(to, 0755);
if (symlink(from, to) < 0) {
mkdir_parents_label(to, 0755);
if (symlink(from, to) < 0) {
- log_error
(
"Failed to create symlink %s: %m", to);
+ log_error
_errno(errno,
"Failed to create symlink %s: %m", to);
return -errno;
}
}
return -errno;
}
}
@@
-241,18
+241,21
@@
static int create_disk(
mkdir_parents_label(to, 0755);
if (symlink(from, to) < 0) {
mkdir_parents_label(to, 0755);
if (symlink(from, to) < 0) {
- log_error
(
"Failed to create symlink %s: %m", to);
+ log_error
_errno(errno,
"Failed to create symlink %s: %m", to);
return -errno;
}
if (!noauto && !nofail) {
return -errno;
}
if (!noauto && !nofail) {
- r = write_drop_in(arg_dest, name, 90, "device-timeout",
+ _cleanup_free_ char *dmname;
+ dmname = strjoin("dev-mapper-", e, ".device", NULL);
+ if (!dmname)
+ return log_oom();
+
+ r = write_drop_in(arg_dest, dmname, 90, "device-timeout",
"# Automatically generated by systemd-cryptsetup-generator \n\n"
"[Unit]\nJobTimeoutSec=0");
"# Automatically generated by systemd-cryptsetup-generator \n\n"
"[Unit]\nJobTimeoutSec=0");
- if (r < 0) {
- log_error("Failed to write device drop-in: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to write device drop-in: %m");
}
return 0;
}
return 0;
@@
-303,7
+306,7
@@
int main(int argc, char *argv[]) {
_cleanup_strv_free_ char **disks_done = NULL;
_cleanup_fclose_ FILE *f = NULL;
unsigned n = 0;
_cleanup_strv_free_ char **disks_done = NULL;
_cleanup_fclose_ FILE *f = NULL;
unsigned n = 0;
- int r = EXIT_FAILURE, r2 = EXIT_FAILURE;
+ int r = EXIT_FAILURE, r2 = EXIT_FAILURE
, z
;
char **i;
if (argc > 1 && argc != 4) {
char **i;
if (argc > 1 && argc != 4) {
@@
-320,8
+323,9
@@
int main(int argc, char *argv[]) {
umask(0022);
umask(0022);
- if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
- goto cleanup;
+ z = parse_proc_cmdline(parse_proc_cmdline_item);
+ if (z < 0)
+ log_warning_errno(z, "Failed to parse kernel command line, ignoring: %m");
if (!arg_enabled) {
r = r2 = EXIT_SUCCESS;
if (!arg_enabled) {
r = r2 = EXIT_SUCCESS;
@@
-338,13
+342,13
@@
int main(int argc, char *argv[]) {
if (errno == ENOENT)
r = EXIT_SUCCESS;
else
if (errno == ENOENT)
r = EXIT_SUCCESS;
else
- log_error
(
"Failed to open /etc/crypttab: %m");
+ log_error
_errno(errno,
"Failed to open /etc/crypttab: %m");
goto next;
}
if (fstat(fileno(f), &st) < 0) {
goto next;
}
if (fstat(fileno(f), &st) < 0) {
- log_error
(
"Failed to stat /etc/crypttab: %m");
+ log_error
_errno(errno,
"Failed to stat /etc/crypttab: %m");
goto next;
}
goto next;
}
@@
-376,7
+380,7
@@
int main(int argc, char *argv[]) {
}
/*
}
/*
- If options are specified on the kernel commandline, let them override
+ If options are specified on the kernel command
line, let them override
the ones from crypttab.
*/
STRV_FOREACH(i, arg_options) {
the ones from crypttab.
*/
STRV_FOREACH(i, arg_options) {
@@
-458,7
+462,7
@@
next:
if (arg_options) {
/*
if (arg_options) {
/*
- If options are specified on the kernel commandline, use them.
+ If options are specified on the kernel command
line, use them.
*/
char **j;
*/
char **j;