From 23c6d5aad3a85ba65aac9af2b6fa69e5ae0046ac3286365f586e94845f0a20f8 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Wed, 13 Feb 2019 08:57:35 +0000
Subject: [PATCH] Accepting request 672164 from devel:CaaSP

OBS-URL: https://build.opensuse.org/request/show/672164
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/read-only-root-fs?expand=0&rev=7
---
 _servicedata                                  |  2 +-
 ...nly-root-fs-1.0+git20180606.046b099.tar.xz |  3 ---
 ...nly-root-fs-1.0+git20190206.586e9f1.tar.xz |  3 +++
 read-only-root-fs.changes                     | 19 +++++++++++++
 read-only-root-fs.spec                        | 27 ++++++++++---------
 5 files changed, 37 insertions(+), 17 deletions(-)
 delete mode 100644 read-only-root-fs-1.0+git20180606.046b099.tar.xz
 create mode 100644 read-only-root-fs-1.0+git20190206.586e9f1.tar.xz

diff --git a/_servicedata b/_servicedata
index 1e86876..848f99b 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">046b09978ef0518412b20530f6d2d8d97edec72e</param>
+    <param name="changesrevision">586e9f1b5ac3cf35a00e21f75f1bc3874b952025</param>
  </service>
 </servicedata>
\ No newline at end of file
diff --git a/read-only-root-fs-1.0+git20180606.046b099.tar.xz b/read-only-root-fs-1.0+git20180606.046b099.tar.xz
deleted file mode 100644
index 1683e89..0000000
--- a/read-only-root-fs-1.0+git20180606.046b099.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f60cb40b9c8a0a20fbd5cc817221dd6bf864ab709a4684fa3a93fe3464d7df75
-size 7872
diff --git a/read-only-root-fs-1.0+git20190206.586e9f1.tar.xz b/read-only-root-fs-1.0+git20190206.586e9f1.tar.xz
new file mode 100644
index 0000000..98274e9
--- /dev/null
+++ b/read-only-root-fs-1.0+git20190206.586e9f1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c327efcc918e7c2fdb2aef6d53d5450371d5dcacfdb71b04a8b2e878882b957d
+size 8072
diff --git a/read-only-root-fs.changes b/read-only-root-fs.changes
index 43a56c4..4747c3e 100644
--- a/read-only-root-fs.changes
+++ b/read-only-root-fs.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Wed Feb  6 14:25:54 UTC 2019 - iforster@suse.com
+
+- Update description to reflect new behaviour
+- Fix creation of overlay directories
+
+-------------------------------------------------------------------
+Wed Feb  6 11:48:10 CET 2019 - kukuk@suse.de
+
+- Fix file list
+
+-------------------------------------------------------------------
+Wed Feb 06 10:26:57 UTC 2019 - fvogt@suse.com
+
+- Update to version 1.0+git20190206.586e9f1:
+  * Remove migration code, only handle the initial setup here
+  * Drop use of fstab.sys
+  * Use a dracut config file instead of a module
+
 -------------------------------------------------------------------
 Wed Jun 06 07:53:45 UTC 2018 - kukuk@suse.de
 
diff --git a/read-only-root-fs.spec b/read-only-root-fs.spec
index e603cc3..6ee3cec 100644
--- a/read-only-root-fs.spec
+++ b/read-only-root-fs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package read-only-root-fs
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           read-only-root-fs
-Version:        1.0+git20180606.046b099
+Version:        1.0+git20190206.586e9f1
 Release:        0
 Summary:        Files and Scripts for a RO root fileystem
 License:        GPL-2.0-or-later
@@ -28,8 +28,9 @@ Source1:        README.packaging.txt
 BuildRequires:  dracut
 Requires:       dracut
 Requires(post): coreutils
-Requires(post): grep
-Requires:       sed
+Requires(post): gawk
+# Required if system with new /etc/fstab entries is supposed to be updated
+Conflicts:      transactional-update < 2.12
 BuildArch:      noarch
 
 %description
@@ -39,9 +40,9 @@ read-only root filesystem with %{_sysconfdir} writeable via overlayfs.
 This package should never be installed in an already running
 system! It should only be selected by a system role for a
 read-only root filesystem with transactional updates.
-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.
+The package will create / modify entries for mounting /etc and /var.
+Those entries are used by dracut to mount the overlay file systems
+during the early boot phase.
 
 %package volatile
 Summary:        Dracut Module to mount a tmpfs overlay on a RO root
@@ -60,13 +61,13 @@ have a writable /root or /home, additional fstab entries can be added.
 
 %install
 cp -a usr %{buildroot}
-mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/{etc,work-etc}
+mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/work-etc
 
 %post
-if [ -f %{_sysconfdir}/fstab -a ! -f %{_sysconfdir}/fstab.sys ]; then
-  %{_sbindir}/setup-fstab.sys-for-overlayfs ||:
+if [ "$1" = 1 ] ; then
+    %{_sbindir}/setup-fstab-for-overlayfs
+    mkdir -p %{_localstatedir}/lib/overlay/1/etc
 fi
-exit 0
 
 %posttrans
 if [ -f /etc/zypp/zypp.conf ]; then
@@ -76,9 +77,9 @@ exit 0
 
 %files
 %license COPYING
-%{_sbindir}/setup-fstab.sys-for-overlayfs
+%{_sbindir}/setup-fstab-for-overlayfs
 %{_localstatedir}/lib/overlay
-%{_prefix}/lib/dracut/modules.d/99read-only-root-fs
+%{_prefix}/lib/dracut/dracut.conf.d/10-read-only-root-fs.conf
 %{_prefix}/lib/systemd/system-preset/*
 
 %files volatile