diff --git a/0001-boot-Ensure-we-remount-var-writable-before-systemd-d.patch b/0001-boot-Ensure-we-remount-var-writable-before-systemd-d.patch new file mode 100644 index 0000000..7b19b7e --- /dev/null +++ b/0001-boot-Ensure-we-remount-var-writable-before-systemd-d.patch @@ -0,0 +1,31 @@ +From 450361d89bb937e157994abb15923a881da57ba3 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Wed, 14 Sep 2016 12:56:07 -0400 +Subject: [PATCH] boot: Ensure we remount /var writable before systemd does + journal flush + +Otherwise, we may not get a persistent journal for the first boot. +https://bugzilla.redhat.com/show_bug.cgi?id=1265295 + +Closes: #511 +Approved by: jlebon +--- + src/boot/ostree-remount.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/boot/ostree-remount.service b/src/boot/ostree-remount.service +index 61dd5fa..8439b49 100644 +--- a/src/boot/ostree-remount.service ++++ b/src/boot/ostree-remount.service +@@ -25,7 +25,7 @@ After=-.mount + After=systemd-remount-fs.service + Before=local-fs.target umount.target + # Other early boot units that need to write to /var +-Before=systemd-random-seed.service plymouth-read-write.service ++Before=systemd-random-seed.service plymouth-read-write.service systemd-journal-flush.service + # tmpfiles.d usually needs write access to a few places + Before=systemd-tmpfiles-setup.service + +-- +2.7.4 + diff --git a/ostree.spec b/ostree.spec index 8bb7584..d5a578a 100644 --- a/ostree.spec +++ b/ostree.spec @@ -12,6 +12,7 @@ URL: http://live.gnome.org/OSTree Patch0: 0001-pull-Do-allow-executing-deltas-when-mirroring-into-b.patch Patch2: 0001-ostree-remount-Explicitly-set-tmp-to-01777.patch +Patch3: 0001-boot-Ensure-we-remount-var-writable-before-systemd-d.patch BuildRequires: git # We always run autogen.sh @@ -129,6 +130,9 @@ install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system-pres %endif %changelog +* Thu Sep 15 2016 walters@verbum.org - 2016.10-3 +- Backport patch to fix bug#1265295 + * Mon Sep 12 2016 Kalev Lember - 2016.10-3 - pull: Do allow executing deltas when mirroring into bare{,-user}