2e6aa36589
- Import a better fix from upstream for bsc#1001765
- Added:
0001-pid1-more-informative-error-message-for-ignored-noti.patch
0001-pid1-process-zero-length-notification-messages-again.patch
- Updated (no code changes, only patch metadata)
0001-If-the-notification-message-length-is-0-ignore-the-m.patch
0001-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch
- Re add back "udev: don't require nsserv and fillup"
Did this in the wrong project... it was a complicated day today ;)
- Added 2 patches to fix bsc#1001765
0001-If-the-notification-message-length-is-0-ignore-the-m.patch
0001-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch
- Revert "udev: don't require nsserv and fillup"
It's been judged too late for being part of SLE12 final release.
Nevertheless it's part of Factory and will be reintroduced after the
final release is out (ie through an update).
- systemd-sysv-convert: make sure that
/var/lib/systemd/sysv-convert/database is always initialized (bsc#982211)
If "--save" command was used and the sysv init script wasn't enabled
at all the database file wasn't created at all. This makes the
subsequent call to "--apply" fail even though this should not
considered as an error.
- Added patches to fix journal with FSS protection enabled (bsc#1000435)
0001-journal-fix-HMAC-calculation-when-appending-a-data-o.patch
0001-journal-set-STATE_ARCHIVED-as-part-of-offlining-2740.patch
OBS-URL: https://build.opensuse.org/request/show/431464
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=241
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From 9f47fe6b6a9aad001e99f1fdea78a0c54ce8ae55 Mon Sep 17 00:00:00 2001
|
|
From: Franck Bui <fbui@suse.com>
|
|
Date: Fri, 23 Sep 2016 12:12:13 +0200
|
|
Subject: [PATCH 1/1] journal: warn when we fail to append a tag to a journal
|
|
|
|
We shouldn't silently fail when appending the tag to a journal file
|
|
since FSS protection will simply be disabled in this case.
|
|
|
|
(cherry picked from commit 43cd8794839548a6f332875e8bee8bed2652bf2c)
|
|
---
|
|
src/journal/journal-file.c | 9 +++++++--
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
|
|
index e7eecad..a9882cf 100644
|
|
--- a/src/journal/journal-file.c
|
|
+++ b/src/journal/journal-file.c
|
|
@@ -145,8 +145,13 @@ JournalFile* journal_file_close(JournalFile *f) {
|
|
|
|
#ifdef HAVE_GCRYPT
|
|
/* Write the final tag */
|
|
- if (f->seal && f->writable)
|
|
- journal_file_append_tag(f);
|
|
+ if (f->seal && f->writable) {
|
|
+ int r;
|
|
+
|
|
+ r = journal_file_append_tag(f);
|
|
+ if (r < 0)
|
|
+ log_error_errno(r, "Failed to append tag when closing journal: %m");
|
|
+ }
|
|
#endif
|
|
|
|
journal_file_set_offline(f);
|
|
--
|
|
2.10.0
|
|
|