From f1095c6021d84c1d053310b0b22ed3b867ce2c76 Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: May 04 2018 08:35:42 +0000
Subject: fix systemd-shutdown: Failed to parse /proc/self/moutinfo (#1554943)


Resolves: #1554943

---

diff --git a/0001-shutdown-fix-incorrect-fscanf-result-check.patch b/0001-shutdown-fix-incorrect-fscanf-result-check.patch
new file mode 100644
index 0000000..8210a7c
--- /dev/null
+++ b/0001-shutdown-fix-incorrect-fscanf-result-check.patch
@@ -0,0 +1,28 @@
+From 63edce22867a8d2029842e3d8ba277547e628006 Mon Sep 17 00:00:00 2001
+From: Fedora systemd team <systemd-maint@redhat.com>
+Date: Fri, 4 May 2018 10:02:20 +0200
+Subject: [PATCH] shutdown: fix incorrect fscanf() result check
+
+(cherry picked from commit 3d4ec01269244c2d35a781abf748ea9ba57666e2)
+
+Resolves: #1554943
+---
+ src/core/umount.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/umount.c b/src/core/umount.c
+index 87c5aa9..7e9ea20 100644
+--- a/src/core/umount.c
++++ b/src/core/umount.c
+@@ -97,7 +97,7 @@ static int mount_points_list_get(MountPoint **head) {
+                            "%ms"        /* (11) mount options */
+                            "%*[^\n]",   /* some rubbish at the end */
+                            &path, &type, &options);
+-                if (k != 2) {
++                if (k != 3) {
+                         if (k == EOF)
+                                 break;
+ 
+-- 
+2.14.3
+
diff --git a/systemd.spec b/systemd.spec
index fd158c1..c5d4859 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -13,7 +13,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        234
-Release:        10%{?gitcommit:.git%{gitcommitshort}}%{?dist}
+Release:        11%{?gitcommit:.git%{gitcommitshort}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        System and Service Manager
@@ -130,6 +130,8 @@ Conflicts:      initscripts < 9.56.1
 Conflicts:      fedora-release < 23-0.12
 %endif
 
+Patch0001:      0001-shutdown-fix-incorrect-fscanf-result-check.patch
+
 %description
 systemd is a system and service manager that runs as PID 1 and starts
 the rest of the system. It provides aggressive parallelization
@@ -1027,6 +1029,9 @@ getent passwd systemd-journal-upload &>/dev/null || useradd -r -l -g systemd-jou
 %{pkgdir}/tests
 
 %changelog
+* Fri May  4 2018 Jan Synáček <jsynacek@redhat.com> - 234-11.git5f8984e
+- fix systemd-shutdown: Failed to parse /proc/self/moutinfo (#1554943)
+
 * Wed Feb 21 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 234-10.git5f8984e
 - a few memory leaks and unitialized memory accesses
 - systemd-networkd Remote= must be a unicast address (upstream issue #8088)