summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-03-31 04:40:02 +0200
committerLennart Poettering <lennart@poettering.net>2011-03-31 04:40:02 +0200
commitba1a55152c50dfbcd3d4a64353b95f4a2f37985e (patch)
treef2c0d6d04ffd3178d5b958aa5d14b108588294c3
parent9408a2d295a312a5472345090e28e0502570494b (diff)
random: do not print warning if random seed doesn't exist yet
-rw-r--r--TODO20
-rw-r--r--src/random-seed.c8
2 files changed, 13 insertions, 15 deletions
diff --git a/TODO b/TODO
index 803c6a8ecd..aa4c37f3c9 100644
--- a/TODO
+++ b/TODO
@@ -10,8 +10,6 @@ F15:
* hook emergency.target into local-fs.target in some way as OnFailure with isolate
-* teach dbus to activate all services it finds in /etc/systemd/services/org-*.service
-
* save/restore tool for SysV as requested by FPC (PENDING)
* bind mounts are ignored
@@ -21,23 +19,21 @@ F15:
* NM should pull in network.target, ntpd should pull in rtc-set.target.
-* document default dependencies
-
* kernel patch wegen kmsg prio nach f15
-* LOG_DAEMON/LOG_USER für kmsg messages schreiben
+* selinux issue http://people.gnome.org/~cosimoc/selinux.jpg
-* disable /dev/console status messages after plymouth went down
+* fix alsa mixer restore to not print error when no config is stored
-* plymouth pid file
+* ply should do mkdir before writing pid file
-* selinux issue http://people.gnome.org/~cosimoc/selinux.jpg
+Features:
-* do not print errors when random seed is not around
+* teach dbus to activate all services it finds in /etc/systemd/services/org-*.service
-* fix alsa mixer restore to not print error when no config is stored
+* document default dependencies
-Features:
+* LOG_DAEMON/LOG_USER für kmsg messages schreiben
* Find a way to replace /var/run, /var/lock directories with
symlinks during an RPM package upgrade (filesystem.rpm or systemd.rpm).
@@ -118,7 +114,7 @@ Features:
* Patch systemd-fsck to use -C and pass console fd to it
-* support remote/ssh systemctl/systemadm, and local privileged access
+* support remote/ssh systemctl/systemadm, and local privileged access → dbus patches need to be merged
* configurable jitter for timer events
diff --git a/src/random-seed.c b/src/random-seed.c
index 8eab2b4e1c..054233e660 100644
--- a/src/random-seed.c
+++ b/src/random-seed.c
@@ -86,9 +86,11 @@ int main(int argc, char *argv[]) {
}
}
- if ((r = loop_read(seed_fd, buf, buf_size, false)) <= 0)
- log_error("Failed to read seed file: %s", r < 0 ? strerror(errno) : "EOF");
- else {
+ if ((r = loop_read(seed_fd, buf, buf_size, false)) <= 0) {
+
+ if (r != 0)
+ log_error("Failed to read seed file: %m");
+ } else {
lseek(seed_fd, 0, SEEK_SET);
if ((r = loop_write(random_fd, buf, (size_t) r, false)) <= 0)