From aaae738520b12100b1143706bb1d9f638db94195ba92994a6c25bd041984e0ac Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Wed, 28 Aug 2019 14:02:07 +0000
Subject: [PATCH] Accepting request 725624 from devel:kubic

OBS-URL: https://build.opensuse.org/request/show/725624
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/read-only-root-fs?expand=0&rev=8
---
 _servicedata                                   |  2 +-
 ...only-root-fs-1.0+git20190206.586e9f1.tar.xz |  3 ---
 ...only-root-fs-1.0+git20190607.11f8587.tar.xz |  3 +++
 read-only-root-fs.changes                      | 14 ++++++++++++++
 read-only-root-fs.spec                         | 18 ++++++++++++++----
 5 files changed, 32 insertions(+), 8 deletions(-)
 delete mode 100644 read-only-root-fs-1.0+git20190206.586e9f1.tar.xz
 create mode 100644 read-only-root-fs-1.0+git20190607.11f8587.tar.xz

diff --git a/_servicedata b/_servicedata
index 848f99b..4930b9e 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">586e9f1b5ac3cf35a00e21f75f1bc3874b952025</param>
+    <param name="changesrevision">c607cec9d060bbf88d69cad03c29e4231246eb43</param>
  </service>
 </servicedata>
\ No newline at end of file
diff --git a/read-only-root-fs-1.0+git20190206.586e9f1.tar.xz b/read-only-root-fs-1.0+git20190206.586e9f1.tar.xz
deleted file mode 100644
index 98274e9..0000000
--- a/read-only-root-fs-1.0+git20190206.586e9f1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c327efcc918e7c2fdb2aef6d53d5450371d5dcacfdb71b04a8b2e878882b957d
-size 8072
diff --git a/read-only-root-fs-1.0+git20190607.11f8587.tar.xz b/read-only-root-fs-1.0+git20190607.11f8587.tar.xz
new file mode 100644
index 0000000..b511985
--- /dev/null
+++ b/read-only-root-fs-1.0+git20190607.11f8587.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a5e815d3d3ef01314dbc894a2a020641e837ea3ec8664a17cd8617ed0467960
+size 8376
diff --git a/read-only-root-fs.changes b/read-only-root-fs.changes
index 4747c3e..948945d 100644
--- a/read-only-root-fs.changes
+++ b/read-only-root-fs.changes
@@ -1,4 +1,18 @@
 -------------------------------------------------------------------
+Fri Jun 07 11:47:47 UTC 2019 - iforster@suse.com
+
+- Update to version 1.0+git20190607.11f8587:
+  * Determine /@ programmatically
+
+-------------------------------------------------------------------
+Thu Jun 06 15:59:41 UTC 2019 - iforster@suse.com
+
+- Update to version 1.0+git20190606.e1f756c:
+  * Mount writable /boot subvolume in GRUB environment
+- Create /boot/writable subvolume to provide a place to store the
+  GRUB environment block or Ignition's firstboot flag on a ro root
+  device
+-------------------------------------------------------------------
 Wed Feb  6 14:25:54 UTC 2019 - iforster@suse.com
 
 - Update description to reflect new behaviour
diff --git a/read-only-root-fs.spec b/read-only-root-fs.spec
index 6ee3cec..21c9ef5 100644
--- a/read-only-root-fs.spec
+++ b/read-only-root-fs.spec
@@ -12,12 +12,12 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           read-only-root-fs
-Version:        1.0+git20190206.586e9f1
+Version:        1.0+git20190607.11f8587
 Release:        0
 Summary:        Files and Scripts for a RO root fileystem
 License:        GPL-2.0-or-later
@@ -26,12 +26,15 @@ Url:            https://github.com/openSUSE/read-only-root-fs
 Source:         read-only-root-fs-%{version}.tar.xz
 Source1:        README.packaging.txt
 BuildRequires:  dracut
+BuildRequires:  update-bootloader-rpm-macros
 Requires:       dracut
 Requires(post): coreutils
 Requires(post): gawk
+Requires(post): snapper
 # Required if system with new /etc/fstab entries is supposed to be updated
-Conflicts:      transactional-update < 2.12
+Conflicts:      transactional-update < 2.15
 BuildArch:      noarch
+%{update_bootloader_requires}
 
 %description
 Files, scripts and directories to run the system with a
@@ -60,7 +63,7 @@ have a writable /root or /home, additional fstab entries can be added.
 %build
 
 %install
-cp -a usr %{buildroot}
+cp -a etc usr %{buildroot}
 mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/work-etc
 
 %post
@@ -68,11 +71,16 @@ if [ "$1" = 1 ] ; then
     %{_sbindir}/setup-fstab-for-overlayfs
     mkdir -p %{_localstatedir}/lib/overlay/1/etc
 fi
+if [ ! -e /boot/writable -a "`findmnt -n -o FSTYPE -l /`" = "btrfs" ]; then
+    %{_sbindir}/mksubvolume /boot/writable
+fi
+%{?update_bootloader_refresh_post}
 
 %posttrans
 if [ -f /etc/zypp/zypp.conf ]; then
     sed -i 's/^multiversion =.*/multiversion =/g' /etc/zypp/zypp.conf
 fi
+%{?update_bootloader_posttrans}
 exit 0
 
 %files
@@ -81,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 %{_sysconfdir}/grub.d
+%config(noreplace) %{_sysconfdir}/grub.d/01_suse_ro_root
 
 %files volatile
 %license COPYING