8143361db9
when booting the system: journald reads from /dev/random, which receives entropy from haveged, which in turn logs to syslog before providing any. Ideally, haveged would provide a proper command-line flag to disable use of syslog. Will work with upstream to resolve this in a cleaner way. (bnc#959237) - Remove "After=systemd-random-seed.service" from systemd service file to avoid the potential for deadlocks when booting the system: systemd-random-seed needs /var to read its previous state; mounting /var needs journald; journald needs entropy; and entropy is provided by haveged, which needs systemd-random-seed. (bnc#959237) OBS-URL: https://build.opensuse.org/package/show/security/haveged?expand=0&rev=109
40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
Index: haveged-1.9.1/src/haveged.c
|
|
===================================================================
|
|
--- haveged-1.9.1.orig/src/haveged.c
|
|
+++ haveged-1.9.1/src/haveged.c
|
|
@@ -361,8 +361,10 @@ static void daemonize( /* RETURN: no
|
|
void) /* IN: nothing */
|
|
{
|
|
FILE *fh;
|
|
+#if 0
|
|
openlog(params->daemon, LOG_CONS, LOG_DAEMON);
|
|
syslog(LOG_NOTICE, "%s starting up", params->daemon);
|
|
+#endif
|
|
if (daemon(0, 0) == -1)
|
|
error_exit("Cannot fork into the background");
|
|
fh = fopen(params->pid_file, "w");
|
|
@@ -499,7 +501,9 @@ static void error_exit( /* RETURN: no
|
|
#ifndef NO_DAEMON
|
|
if (params->detached!=0) {
|
|
unlink(params->pid_file);
|
|
+#if 0
|
|
syslog(LOG_INFO, "%s: %s", params->daemon, buffer);
|
|
+#endif
|
|
}
|
|
else
|
|
#endif
|
|
@@ -609,11 +613,13 @@ static void print_msg( /* RETURN: no
|
|
va_list ap;
|
|
va_start(ap, format);
|
|
snprintf(buffer, sizeof(buffer), "%s: %s", params->daemon, format);
|
|
+#if 0
|
|
#ifndef NO_DAEMON
|
|
if (params->detached != 0)
|
|
vsyslog(LOG_INFO, buffer, ap);
|
|
else
|
|
#endif
|
|
+#endif
|
|
vfprintf(stderr, buffer, ap);
|
|
va_end(ap);
|
|
}
|