Re-port walters' patches to unbreak Atomic BZ#1195761

0001-Re-apply-walters-unit-patch-for-F23-systemd-v222.patch

@@ -0,0 +1,45 @@
+From c40bef16bf3e63a42718260b4633cb2d682984d8 Mon Sep 17 00:00:00 2001
+From: Adam Miller <admiller@redhat.com>
+Date: Fri, 18 Sep 2015 17:57:35 -0500
+Subject: [PATCH 2/2] Re-apply walters' unit patch for F23/systemd-v222
+
+Originally in the f22 fedpkg/distgit branch with commit id:
+    9bbe0e92dc59d5a42258c729b105a7d9901eb35e
+
+[PATCH] unit: When stopping due to BindsTo=, log which unit caused it
+
+I'm trying to track down a relatively recent change in systemd
+which broke OSTree; see
+https://bugzilla.gnome.org/show_bug.cgi?id=743891
+
+Systemd started to stop sysroot.mount, and this patch should help
+me debug why at least.
+---
+ src/core/unit.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/unit.c b/src/core/unit.c
+index fac017c..0a66a6a 100644
+--- a/src/core/unit.c
++++ b/src/core/unit.c
+@@ -1641,7 +1641,7 @@ static void unit_check_unneeded(Unit *u) {
+ 
+ static void unit_check_binds_to(Unit *u) {
+         bool stop = false;
+-        Unit *other;
++        Unit *other = NULL;
+         Iterator i;
+         int r;
+ 
+@@ -1676,7 +1676,7 @@ static void unit_check_binds_to(Unit *u) {
+         }
+ 
+         assert(other);
+-        log_unit_info(u, "Unit is bound to inactive unit %s. Stopping, too.", other->id);
++        log_unit_info(u->id, "Unit %s is bound to inactive unit %s. Stopping, too.", u->id, other->id);
+ 
+         /* A unit we need to run is gone. Sniff. Let's stop this. */
+         r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, true, NULL, NULL);
+-- 
+2.4.3
+

0001-Revert-core-mount-add-dependencies-to-dynamically-mo-v222.patch

@@ -0,0 +1,27 @@
+From eade863e97e0a09daefd844728c7f5a25a914924 Mon Sep 17 00:00:00 2001
+From: Adam Miller <admiller@redhat.com>
+Date: Fri, 18 Sep 2015 17:55:19 -0500
+Subject: [PATCH 1/2] Revert "core/mount: add dependencies to dynamically
+ mounted mounts too"
+
+This reverts commit 06e97888883e2cc12eb6514e80c7f0014295f59b.
+---
+ src/core/mount.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/mount.c b/src/core/mount.c
+index 851b413..87c4088 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -304,7 +304,7 @@ static int mount_add_device_links(Mount *m) {
+ 
+         assert(m);
+ 
+-        p = get_mount_parameters(m);
++        p = get_mount_parameters_fragment(m);
+         if (!p)
+                 return 0;
+ 
+-- 
+2.4.3
+

systemd.spec

@@ -13,7 +13,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        222
-Release:        4%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release:        5%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -40,6 +40,9 @@ Patch0002:      0002-load-fragment-fix-segv-on-parse-error.patch
 Patch0003:      0003-man-clarify-that-unknown-escapes-must-be-escaped.patch
 Patch0004:      0004-keymap-Add-Corsair-K70.patch
 
+Patch998: 0001-Re-apply-walters-unit-patch-for-F23-systemd-v222.patch
+Patch999: 0001-Revert-core-mount-add-dependencies-to-dynamically-mo-v222.patch
+
 # kernel-install patch for grubby, drop if grubby is obsolete
 Patch1000:      kernel-install-grubby.patch
 
@@ -771,6 +774,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
 /usr/lib/firewalld/services/*
 
 %changelog
+* Fri Sep 18 2015 Adam Miller <maxamillion@fedoraproject.org> - 222-5
+- Re-revert patch from walters that breaks Atomic/OSTree (#1195761)
+
 * Fri Sep 18 2015 Jan Synáček <jsynacek@redhat.com> - 222-4
 - Fix: user systemd-journal-upload should be in systemd-journal group (#1262743)