From 465f7fc16b3ad9ab9169db7d5c3ccca482a17fd4 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 25 2014 15:41:24 +0000
Subject: import initscripts-9.49.17-1.el7_0.1


---

diff --git a/SOURCES/0001-fedora-readonly-fix-prefix-detection-1059749.patch b/SOURCES/0001-fedora-readonly-fix-prefix-detection-1059749.patch
new file mode 100644
index 0000000..51fe164
--- /dev/null
+++ b/SOURCES/0001-fedora-readonly-fix-prefix-detection-1059749.patch
@@ -0,0 +1,35 @@
+From bdfa5a5d4e959937fe9f525d8ce39cec410dbe08 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=A1clav=20Pavl=C3=ADn?= <vpavlin@redhat.com>
+Date: Wed, 16 Apr 2014 13:47:53 +0200
+Subject: [PATCH] fedora-readonly: fix prefix detection (#1059749)
+
+---
+ systemd/rhel-readonly | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/systemd/rhel-readonly b/systemd/rhel-readonly
+index 190de26..f33eef4 100755
+--- a/systemd/rhel-readonly
++++ b/systemd/rhel-readonly
+@@ -42,7 +42,8 @@ MOUNTS=()
+ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then
+ 
+         add_mount() {
+-                MOUNTS=("${MOUNTS[@]}" "$1")
++                mnt=${1%/}
++                MOUNTS=("${MOUNTS[@]}" "$mnt")
+         }
+ 
+         cp_empty() {
+@@ -109,7 +110,7 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then
+                 prefix=0
+                 for mount_point in "${MOUNTS[@]}"; do
+                         [[ $m = $mount_point ]] && continue
+-                        if [[ $m =~ ^$mount_point.* ]] ; then
++                        if [[ $m =~ ^$mount_point/.* ]] ; then
+                                 prefix=1
+                                 break
+                         fi
+-- 
+1.8.3.1
+
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index 194cac7..c87e075 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -4,7 +4,7 @@ Version: 9.49.17
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 URL: http://fedorahosted.org/releases/i/n/initscripts/
 Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -35,6 +35,8 @@ Requires(preun): /sbin/chkconfig
 BuildRequires: glib2-devel popt-devel gettext pkgconfig
 Provides: /sbin/service
 
+Patch0: 0001-fedora-readonly-fix-prefix-detection-1059749.patch
+
 %description
 The initscripts package contains basic system scripts used
 during a boot of the system. It also contains scripts which
@@ -53,6 +55,7 @@ Currently, this consists of various memory checking code.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make
@@ -215,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Thu Aug 14 2014 Lukáš Nykrýn <lnykryn@redhat.com> - 9.49.17-1.1
+- fedora-readonly: fix prefix detection
+
 * Wed Apr 02 2014 Lukáš Nykrýn <lnykryn@redhat.com> - 9.49.17-1
 - add configurable DEVTIMEOUT