Sync from SUSE:SLFO:Main read-only-root-fs revision 8764ecb0fb5ea22d280c8f996649eef5

_service

@@ -1,14 +1,14 @@
 <services>
-  <service name="tar_scm" mode="disabled">
+  <service name="tar_scm" mode="manual">
     <param name="version">1.0</param>
     <param name="versionformat">1.0+git%cd.%h</param>
     <param name="url">https://github.com/openSUSE/read-only-root-fs.git</param>
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
   </service>
-  <service name="recompress" mode="disabled">
+  <service name="recompress" mode="manual">
     <param name="compression">xz</param>
     <param name="file">*.tar</param>
   </service>
-  <service name="set_version" mode="disabled"/>
+  <service name="set_version" mode="manual"/>
 </services>

_servicedata

@@ -1,6 +1,6 @@
 <servicedata>
   <service name="tar_scm">
     <param name="url">https://github.com/openSUSE/read-only-root-fs.git</param>
-    <param name="changesrevision">d85232a9c138eb6dc768c97ac3a5b2d80c16b7e6</param>
+    <param name="changesrevision">3eed5de5f52022d998174e55647078decb36620e</param>
   </service>
 </servicedata>

read-only-root-fs.changes

@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Tue Jul 08 12:47:38 UTC 2025 - Fabian Vogt <fvogt@suse.com>
+
+- Update to version 1.0+git20250708.3eed5de:
+  * writable-etc: Install findmnt instead of mountpoint
+  * CI: Omit volatile-overlay from the initrd
+  * Add basic CI
+  * Only remount when [/sysroot]/etc is ro (bsc#1246021)
+
+-------------------------------------------------------------------
+Tue Apr 22 12:27:34 UTC 2025 - Fabian Vogt <fvogt@suse.com>
+
+- Update to version 1.0+git20250422.3e17744:
+  * Remount /sysroot/etc between sysroot-etc.mount and initrd-fs.target
+
+-------------------------------------------------------------------
+Tue Apr 15 14:23:08 UTC 2025 - Fabian Vogt <fvogt@suse.com>
+
+- Update to version 1.0+git20250415.7e7aea4:
+  * Add missing dependency on mountpoint
+
+-------------------------------------------------------------------
+Tue Apr 15 13:03:01 UTC 2025 - Fabian Vogt <fvogt@suse.com>
+
+- Add missing dependencies for %post
+
+-------------------------------------------------------------------
+Mon Apr 14 13:26:18 UTC 2025 - fvogt@suse.com
+
+- Update to version 1.0+git20250414.6ef7163:
+  * Add a note why we need to keep 10-read-only-root-fs.conf around
+  * Migrate from /etc overlays to subvolumes
+- Switch _service to use mode="manual"
+
 -------------------------------------------------------------------
 Wed Feb 28 15:15:15 UTC 2024 - fvogt@suse.com
 

read-only-root-fs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package read-only-root-fs
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # 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+git20240228.d85232a
+Version:        1.0+git20250708.3eed5de
 Release:        0
 Summary:        Files and Scripts for a RO root fileystem
 License:        GPL-2.0-or-later
@@ -28,17 +28,19 @@ Source1:        README.packaging.txt
 BuildRequires:  dracut
 BuildRequires:  update-bootloader-rpm-macros
 Requires:       dracut
-Requires(post): /usr/bin/mkdir /usr/bin/cat /usr/bin/sed
+Requires(post): /usr/bin/mv /usr/bin/rsync /usr/bin/gawk /usr/sbin/btrfs
-Requires(post): gawk
 Requires(post): snapper
 # Required if system with new /etc/fstab entries is supposed to be updated
-Conflicts:      transactional-update < 2.15
+Conflicts:      transactional-update < 5.0.0
+# Support for /etc as subvolume
+Conflicts:      combustion < 1.5
+Conflicts:      ignition < 2.21.0
 BuildArch:      noarch
 %{update_bootloader_requires}
 
 %description
 Files, scripts and directories to run the system with a
-read-only root filesystem with %{_sysconfdir} writeable via overlayfs.
+read-only root filesystem with nested writable %{_sysconfdir} BTRFS subvolume.
 
 This package should never be installed in an already running
 system! It should only be selected by a system role for a
@@ -58,18 +60,16 @@ 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
+%autosetup -p1
 
 %build
 
 %install
 cp -a etc usr %{buildroot}
-mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/work-etc
 
 %post
-if [ "$1" = 1 ] ; then
+if [ "$1" = 1 -a "`findmnt -n -o FSTYPE -l /`" = "btrfs" ] ; then
-    %{_sbindir}/setup-fstab-for-overlayfs
+    %{_libexecdir}/setup-etc-subvol
-    mkdir -p %{_localstatedir}/lib/overlay/1/etc
 fi
 if [ ! -e /boot/writable -a "`findmnt -n -o FSTYPE -l /`" = "btrfs" ]; then
     %{_sbindir}/mksubvolume /boot/writable
@@ -90,9 +90,10 @@ exit 0
 
 %files
 %license COPYING
-%{_sbindir}/setup-fstab-for-overlayfs
+%{_libexecdir}/setup-etc-subvol
-%{_localstatedir}/lib/overlay
 %{_prefix}/lib/dracut/dracut.conf.d/10-read-only-root-fs.conf
+%dir %{_prefix}/lib/dracut/modules.d/50writable-etc
+%{_prefix}/lib/dracut/modules.d/50writable-etc/*
 %{_prefix}/lib/systemd/system-preset/*
 %dir %{_prefix}/lib/systemd/system/systemd-udevd.service.d
 %{_prefix}/lib/systemd/system/systemd-udevd.service.d/etcmount.conf