From dd5a59cdea25a2976e7e62006783a20044c2d05d7e152233c583087d46fe520c Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Mon, 16 Apr 2018 10:52:54 +0000
Subject: [PATCH] Accepting request 596943 from devel:CaaSP

OBS-URL: https://build.opensuse.org/request/show/596943
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/read-only-root-fs?expand=0&rev=4
---
 _servicedata                                  |  2 +-
 ...nly-root-fs-1.0+git20180321.a5b34ab.tar.xz |  3 --
 ...nly-root-fs-1.0+git20180416.825ad6c.tar.xz |  3 ++
 read-only-root-fs.changes                     |  8 ++++++
 read-only-root-fs.spec                        | 28 ++++++++++++++-----
 5 files changed, 33 insertions(+), 11 deletions(-)
 delete mode 100644 read-only-root-fs-1.0+git20180321.a5b34ab.tar.xz
 create mode 100644 read-only-root-fs-1.0+git20180416.825ad6c.tar.xz

diff --git a/_servicedata b/_servicedata
index 659632b..36c1ce6 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">a5b34abb9733656ccb5dea55b5df3f5504f21cfd</param>
+    <param name="changesrevision">af97c9273ea2a2c449817fc41197dad6ba5037c7</param>
  </service>
 </servicedata>
\ No newline at end of file
diff --git a/read-only-root-fs-1.0+git20180321.a5b34ab.tar.xz b/read-only-root-fs-1.0+git20180321.a5b34ab.tar.xz
deleted file mode 100644
index 168ec13..0000000
--- a/read-only-root-fs-1.0+git20180321.a5b34ab.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a5044c1e61f0de86c2c9f4a539c5a0dee285c0b92dc2042097313533807a30e
-size 7528
diff --git a/read-only-root-fs-1.0+git20180416.825ad6c.tar.xz b/read-only-root-fs-1.0+git20180416.825ad6c.tar.xz
new file mode 100644
index 0000000..4eeede2
--- /dev/null
+++ b/read-only-root-fs-1.0+git20180416.825ad6c.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4736990f5e06957e84886087f17bf9166f06e85c0faf5a34fe1087d93df53f4c
+size 7828
diff --git a/read-only-root-fs.changes b/read-only-root-fs.changes
index b9bbe6e..b2535eb 100644
--- a/read-only-root-fs.changes
+++ b/read-only-root-fs.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Apr 16 08:52:47 UTC 2018 - fvogt@suse.com
+
+- Update to version 1.0+git20180416.825ad6c:
+  * Add new 99volatile-overlay dracut module
+- BuildRequire/Require dracut for proper directory ownership
+- Fix posttrans if zypper is not installed
+
 -------------------------------------------------------------------
 Wed Mar 21 09:38:22 CET 2018 - kukuk@suse.de
 
diff --git a/read-only-root-fs.spec b/read-only-root-fs.spec
index 7503634..dd155e5 100644
--- a/read-only-root-fs.spec
+++ b/read-only-root-fs.spec
@@ -17,7 +17,7 @@
 
 
 Name:           read-only-root-fs
-Version:        1.0+git20180321.a5b34ab
+Version:        1.0+git20180416.825ad6c
 Release:        0
 Summary:        Files and Scripts for a RO root fileystem
 License:        GPL-2.0-or-later
@@ -25,6 +25,8 @@ Group:          System/Fhs
 Url:            https://github.com/openSUSE/read-only-root-fs
 Source:         read-only-root-fs-%{version}.tar.xz
 Source1:        README.packaging.txt
+BuildRequires:  dracut
+Requires:       dracut
 Requires(post): coreutils
 Requires(post): grep
 Requires:       sed
@@ -41,6 +43,15 @@ A new file /etc/fstab.sys is created and included in the initrd.
 The multiversion features of libzypp and the purge-kernel service
 will be disabled.
 
+%package volatile
+Summary:        Dracut Module to mount a tmpfs overlay on a RO root
+Group:          System/Fhs
+Requires:       dracut
+
+%description volatile
+A dracut module which mounts an overlayfs each on /etc and /var, with the upper
+layer in a tmpfs mount. This is the minimal setup to get a booting system, to
+have a writable /root or /home, additional fstab entries can be added.
 
 %prep
 %setup -q
@@ -49,9 +60,7 @@ will be disabled.
 
 %install
 cp -a usr %{buildroot}
-mkdir -p %{buildroot}%{_localstatedir}/lib/overlay
-mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/etc
-mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/work-etc
+mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/{etc,work-etc}
 
 %post
 if [ -f %{_sysconfdir}/fstab -a ! -f %{_sysconfdir}/fstab.sys ]; then
@@ -60,15 +69,20 @@ fi
 exit 0
 
 %posttrans
-sed -i 's/^multiversion =.*/multiversion =/g' /etc/zypp/zypp.conf
+if [ -f /etc/zypp/zypp.conf ]; then
+    sed -i 's/^multiversion =.*/multiversion =/g' /etc/zypp/zypp.conf
+fi
+exit 0
 
 %files
 %license COPYING
 %{_sbindir}/setup-fstab.sys-for-overlayfs
 %{_localstatedir}/lib/overlay
-%dir %{_prefix}/lib/dracut
-%dir %{_prefix}/lib/dracut/modules.d
 %{_prefix}/lib/dracut/modules.d/99read-only-root-fs
 %{_prefix}/lib/systemd/system-preset/*
 
+%files volatile
+%license COPYING
+%{_prefix}/lib/dracut/modules.d/99volatile-overlay/
+
 %changelog