Add additional check in %post to prevent generating the btrfs /etc subvolume during a KIWI run [bsc#1250133] [gh#openSUSE/read-only-root-fs#27]

_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">5b5844c806d059a65b19b8979595902e2fd72373</param>
+    <param name="changesrevision">3eed5de5f52022d998174e55647078decb36620e</param>
   </service>
 </servicedata>

read-only-root-fs.changes

@@ -5,13 +5,6 @@ Fri Sep 19 09:20:04 UTC 2025 - Ignaz Forster <iforster@suse.com>
   /etc subvolume during a KIWI run
   [bsc#1250133] [gh#openSUSE/read-only-root-fs#27]
 
--------------------------------------------------------------------
-Thu Aug 07 13:17:48 UTC 2025 - Fabian Vogt <fvogt@suse.com>
-
-- Migrate from ro to ro=vfs (boo#1156421)
-- Update to version 1.0+git20250807.5b5844c:
-  * Remove workarounds obsoleted by ro=vfs
-
 -------------------------------------------------------------------
 Tue Jul 08 12:47:38 UTC 2025 - Fabian Vogt <fvogt@suse.com>
 

read-only-root-fs.spec

@@ -17,7 +17,7 @@
 
 
 Name:           read-only-root-fs
-Version:        1.0+git20250807.5b5844c
+Version:        1.0+git20250708.3eed5de
 Release:        0
 Summary:        Files and Scripts for a RO root fileystem
 License:        GPL-2.0-or-later
@@ -88,12 +88,6 @@ fi
 for var in BTRFS_BALANCE_MOUNTPOINTS BTRFS_SCRUB_MOUNTPOINTS BTRFS_TRIM_MOUNTPOINTS; do
     grep -q "${var}=\"/\"" /etc/sysconfig/btrfsmaintenance && sed -i "s|${var}=.*|${var}=\"/.snapshots\"|g" /etc/sysconfig/btrfsmaintenance
 done
-
-# Replace ro with ro=vfs for / (boo#1156421)
-if [ -f %{_sysconfdir}/fstab ] && ! grep -qw "ro=vfs" %{_sysconfdir}/fstab; then
-    gawk -i inplace '$2 == "/" && match($4, /^(.*,)?ro(,.*)?$/, m) { $4 = m[1] "ro=vfs" m[2]; } { print }' %{_sysconfdir}/fstab
-fi
-
 %{?update_bootloader_posttrans}
 exit 0
 
@@ -106,6 +100,8 @@ exit 0
 %{_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 %{_prefix}/lib/systemd/system/systemd-journal-flush.service.d
+%{_prefix}/lib/systemd/system/systemd-journal-flush.service.d/afterlocalfs.conf
 %dir %{_prefix}/lib/systemd/system/systemd-remount-fs.service.d
 %{_prefix}/lib/systemd/system/systemd-remount-fs.service.d/writableagain.conf
 %dir %{_sysconfdir}/grub.d