picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

random-seed: improve debugging messages a bit

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-11-12 22:05:16 -05:00
parent 4e8da52959
commit 952d97ed2b
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -163,6 +163,7 @@ AM_CPPFLAGS = \
-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \ -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \ -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
-DROOTPREFIX=\"$(rootprefix)\" \ -DROOTPREFIX=\"$(rootprefix)\" \
-DRANDOM_SEED_DIR=\"$(localstatedir)/lib/systemd/\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/systemd/random-seed\" \ -DRANDOM_SEED=\"$(localstatedir)/lib/systemd/random-seed\" \
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \ -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \ -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
@ -4339,6 +4340,7 @@ substitutions = \
'|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \ '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
'|PACKAGE_NAME=$(PACKAGE_NAME)|' \ '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
'|PACKAGE_URL=$(PACKAGE_URL)|' \ '|PACKAGE_URL=$(PACKAGE_URL)|' \
'|RANDOM_SEED_DIR=$(localstatedir)/lib/systemd/|' \
'|RANDOM_SEED=$(localstatedir)/lib/systemd/random-seed|' \ '|RANDOM_SEED=$(localstatedir)/lib/systemd/random-seed|' \
'|prefix=$(prefix)|' \ '|prefix=$(prefix)|' \
'|exec_prefix=$(exec_prefix)|' \ '|exec_prefix=$(exec_prefix)|' \

8
src/random-seed/random-seed.c
View file

@ -72,7 +72,7 @@ int main(int argc, char *argv[]) {
r = mkdir_parents_label(RANDOM_SEED, 0755); r = mkdir_parents_label(RANDOM_SEED, 0755);
if (r < 0) { if (r < 0) {
log_error("Failed to create parent directory of " RANDOM_SEED ": %s", strerror(-r)); log_error("Failed to create directory " RANDOM_SEED_DIR ": %s", strerror(-r));
goto finish; goto finish;
} }
@ -86,7 +86,7 @@ int main(int argc, char *argv[]) {
if (seed_fd < 0) { if (seed_fd < 0) {
seed_fd = open(RANDOM_SEED, O_RDONLY|O_CLOEXEC|O_NOCTTY); seed_fd = open(RANDOM_SEED, O_RDONLY|O_CLOEXEC|O_NOCTTY);
if (seed_fd < 0) { if (seed_fd < 0) {
log_error("Failed to open random seed: %m"); log_error("Failed to open " RANDOM_SEED ": %m");
r = -errno; r = -errno;
goto finish; goto finish;
} }
@ -106,7 +106,7 @@ int main(int argc, char *argv[]) {
if (k <= 0) { if (k <= 0) {
if (r != 0) if (r != 0)
log_error("Failed to read seed file: %m"); log_error("Failed to read seed from " RANDOM_SEED ": %m");
r = k == 0 ? -EIO : (int) k; r = k == 0 ? -EIO : (int) k;
@ -125,7 +125,7 @@ int main(int argc, char *argv[]) {
seed_fd = open(RANDOM_SEED, O_WRONLY|O_CLOEXEC|O_NOCTTY|O_CREAT, 0600); seed_fd = open(RANDOM_SEED, O_WRONLY|O_CLOEXEC|O_NOCTTY|O_CREAT, 0600);
if (seed_fd < 0) { if (seed_fd < 0) {
log_error("Failed to open random seed: %m"); log_error("Failed to open " RANDOM_SEED ": %m");
r = -errno; r = -errno;
goto finish; goto finish;
} }