From f5191fcf1aaa439e7846f3713e798d05588003b8 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Oct 10 2016 20:29:28 +0000
Subject: [PATCH 1/3] Add an empty postprocess script


This is a place to add workarounds and config changes

---

diff --git a/fedora-ostree-workstation.json b/fedora-ostree-workstation.json
index 98b2830..ac0f502 100644
--- a/fedora-ostree-workstation.json
+++ b/fedora-ostree-workstation.json
@@ -18,6 +18,8 @@
     "check-passwd": { "type": "file", "filename": "passwd" },
     "check-groups": { "type": "file", "filename": "group" },
 
+    "postprocess-script": "post.sh",
+
     "packages": [
 		"aajohan-comfortaa-fonts",
 		"abrt",
diff --git a/post.sh b/post.sh
new file mode 100755
index 0000000..0827765
--- /dev/null
+++ b/post.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+set -xeuo pipefail

From 44883daf24125ca36aa147f96012ff902d89cb1a Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Oct 10 2016 20:31:11 +0000
Subject: [PATCH 2/3] Fix problem with systemd logs not being persisted


During the boot with ostree, the detection of whether the logs on
the system should be persisted can be confused. Explicitely configure
them to be persisted.

Copied from atomic-ws.

---

diff --git a/post.sh b/post.sh
index 0827765..d139161 100755
--- a/post.sh
+++ b/post.sh
@@ -1,3 +1,8 @@
 #!/bin/bash
 
 set -xeuo pipefail
+
+# See https://bugzilla.redhat.com/show_bug.cgi?id=1265295 ; some
+# aspects of that have been fixed, but apparently this is still
+# necessary, and generally makes things less finicky
+echo 'Storage=persistent' >> /etc/systemd/journald.conf

From 392bd281cdd48c12fa6e36feb7fd4b75f41d5694 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Oct 10 2016 20:31:53 +0000
Subject: [PATCH 3/3] Work around systemd issue with ProtectHome


Systemd has issues with the ProtectHome directive when /home is a
symlink. Since this is used by several systemd-provided services,
this causes problems with starting them up. Work around this temporarily
by removing these lines. (The issue will be fixed in systemd 232)

Copied from atomic-ws.

---

diff --git a/post.sh b/post.sh
index d139161..9698163 100755
--- a/post.sh
+++ b/post.sh
@@ -6,3 +6,6 @@ set -xeuo pipefail
 # aspects of that have been fixed, but apparently this is still
 # necessary, and generally makes things less finicky
 echo 'Storage=persistent' >> /etc/systemd/journald.conf
+
+# Work around https://github.com/systemd/systemd/issues/4082
+find /usr/lib/systemd/system/ -type f -exec sed -i -e '/^PrivateTmp=/d' -e '/^Protect\(Home\|System\)=/d' {} \;