From de0a706c35db434b7b2bfbda8a6ad2175578d2c40183d936f2b448d015f7c538 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Mon, 18 Nov 2019 18:57:12 +0000
Subject: [PATCH] Accepting request 747789 from devel:kubic

- Update to version 1.0+git20191112.42add9e:
  * Add RequiresMountsFor=/etc override for systemd-udevd.service

OBS-URL: https://build.opensuse.org/request/show/747789
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/read-only-root-fs?expand=0&rev=9
---
 _servicedata                                     |  2 +-
 read-only-root-fs-1.0+git20190607.11f8587.tar.xz |  3 ---
 read-only-root-fs-1.0+git20191112.42add9e.tar.xz |  3 +++
 read-only-root-fs.changes                        |  6 ++++++
 read-only-root-fs.spec                           | 10 ++++++----
 5 files changed, 16 insertions(+), 8 deletions(-)
 delete mode 100644 read-only-root-fs-1.0+git20190607.11f8587.tar.xz
 create mode 100644 read-only-root-fs-1.0+git20191112.42add9e.tar.xz

diff --git a/_servicedata b/_servicedata
index 4930b9e..c67280b 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,6 @@
 <servicedata>
   <service name="tar_scm">
     <param name="url">git://github.com/openSUSE/read-only-root-fs.git</param>
-    <param name="changesrevision">c607cec9d060bbf88d69cad03c29e4231246eb43</param>
+    <param name="changesrevision">21c36fb3bfa66dc2bf331738f9492eda3d8f5581</param>
  </service>
 </servicedata>
\ No newline at end of file
diff --git a/read-only-root-fs-1.0+git20190607.11f8587.tar.xz b/read-only-root-fs-1.0+git20190607.11f8587.tar.xz
deleted file mode 100644
index b511985..0000000
--- a/read-only-root-fs-1.0+git20190607.11f8587.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5a5e815d3d3ef01314dbc894a2a020641e837ea3ec8664a17cd8617ed0467960
-size 8376
diff --git a/read-only-root-fs-1.0+git20191112.42add9e.tar.xz b/read-only-root-fs-1.0+git20191112.42add9e.tar.xz
new file mode 100644
index 0000000..d5240ff
--- /dev/null
+++ b/read-only-root-fs-1.0+git20191112.42add9e.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb8fbc583434679b63abecae4e4a25df42ccfbd54660b576453e1d9f0dd63119
+size 8476
diff --git a/read-only-root-fs.changes b/read-only-root-fs.changes
index 948945d..cd863a1 100644
--- a/read-only-root-fs.changes
+++ b/read-only-root-fs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 12 16:18:56 UTC 2019 - kukuk@suse.com
+
+- Update to version 1.0+git20191112.42add9e:
+  * Add RequiresMountsFor=/etc override for systemd-udevd.service
+
 -------------------------------------------------------------------
 Fri Jun 07 11:47:47 UTC 2019 - iforster@suse.com
 
diff --git a/read-only-root-fs.spec b/read-only-root-fs.spec
index 21c9ef5..61fb1fd 100644
--- a/read-only-root-fs.spec
+++ b/read-only-root-fs.spec
@@ -17,12 +17,12 @@
 
 
 Name:           read-only-root-fs
-Version:        1.0+git20190607.11f8587
+Version:        1.0+git20191112.42add9e
 Release:        0
 Summary:        Files and Scripts for a RO root fileystem
 License:        GPL-2.0-or-later
 Group:          System/Fhs
-Url:            https://github.com/openSUSE/read-only-root-fs
+URL:            https://github.com/openSUSE/read-only-root-fs
 Source:         read-only-root-fs-%{version}.tar.xz
 Source1:        README.packaging.txt
 BuildRequires:  dracut
@@ -77,8 +77,8 @@ fi
 %{?update_bootloader_refresh_post}
 
 %posttrans
-if [ -f /etc/zypp/zypp.conf ]; then
-    sed -i 's/^multiversion =.*/multiversion =/g' /etc/zypp/zypp.conf
+if [ -f %{_sysconfdir}/zypp/zypp.conf ]; then
+    sed -i 's/^multiversion =.*/multiversion =/g' %{_sysconfdir}/zypp/zypp.conf
 fi
 %{?update_bootloader_posttrans}
 exit 0
@@ -89,6 +89,8 @@ exit 0
 %{_localstatedir}/lib/overlay
 %{_prefix}/lib/dracut/dracut.conf.d/10-read-only-root-fs.conf
 %{_prefix}/lib/systemd/system-preset/*
+%dir %{_prefix}/lib/systemd/system/systemd-udevd.service.d
+%{_prefix}/lib/systemd/system/systemd-udevd.service.d/etcmount.conf
 %dir %{_sysconfdir}/grub.d
 %config(noreplace) %{_sysconfdir}/grub.d/01_suse_ro_root