Hello community,
here is the log from the commit of package read-only-root-fs for
openSUSE:Factory checked in at 2019-08-28 16:02:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/read-only-root-fs (Old)
and /work/SRC/openSUSE:Factory/.read-only-root-fs.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "read-only-root-fs"
Wed Aug 28 16:02:07 2019 rev:8 rq:725624 version:1.0+git20190607.11f8587
Changes:
--------
--- /work/SRC/openSUSE:Factory/read-only-root-fs/read-only-root-fs.changes
2019-02-13 09:57:41.173674931 +0100
+++
/work/SRC/openSUSE:Factory/.read-only-root-fs.new.7948/read-only-root-fs.changes
2019-08-28 16:02:15.266793535 +0200
@@ -1,0 +2,14 @@
+Fri Jun 07 11:47:47 UTC 2019 - [email protected]
+
+- Update to version 1.0+git20190607.11f8587:
+ * Determine /@ programmatically
+
+-------------------------------------------------------------------
+Thu Jun 06 15:59:41 UTC 2019 - [email protected]
+
+- 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
+-------------------------------------------------------------------
Old:
----
read-only-root-fs-1.0+git20190206.586e9f1.tar.xz
New:
----
read-only-root-fs-1.0+git20190607.11f8587.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ read-only-root-fs.spec ++++++
--- /var/tmp/diff_new_pack.cU9lPS/_old 2019-08-28 16:02:16.502793350 +0200
+++ /var/tmp/diff_new_pack.cU9lPS/_new 2019-08-28 16:02:16.502793350 +0200
@@ -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 @@
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 @@
%build
%install
-cp -a usr %{buildroot}
+cp -a etc usr %{buildroot}
mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/work-etc
%post
@@ -68,11 +71,16 @@
%{_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 @@
%{_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
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.cU9lPS/_old 2019-08-28 16:02:16.550793343 +0200
+++ /var/tmp/diff_new_pack.cU9lPS/_new 2019-08-28 16:02:16.550793343 +0200
@@ -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
++++++ read-only-root-fs-1.0+git20190206.586e9f1.tar.xz ->
read-only-root-fs-1.0+git20190607.11f8587.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/read-only-root-fs-1.0+git20190206.586e9f1/etc/grub.d/01_suse_ro_root
new/read-only-root-fs-1.0+git20190607.11f8587/etc/grub.d/01_suse_ro_root
--- old/read-only-root-fs-1.0+git20190206.586e9f1/etc/grub.d/01_suse_ro_root
1970-01-01 01:00:00.000000000 +0100
+++ new/read-only-root-fs-1.0+git20190607.11f8587/etc/grub.d/01_suse_ro_root
2019-06-07 13:06:04.000000000 +0200
@@ -0,0 +1,20 @@
+#!/bin/sh
+boot_rw_subvol="/boot/writable"
+
+. "$pkgdatadir/grub-mkconfig_lib"
+
+cat << EOF
+# On read-only root file systems /boot/writable provides a writeable
+# subvolume, e.g. to store the GRUB environment block.
+set boot_rw_subvol=${boot_rw_subvol}
+btrfs-mount-subvol "(\${root})" "\${boot_rw_subvol}" "$(${grub_mkrelpath}
${boot_rw_subvol})"
+
+# Use above location to load GRUB environment variables
+if [ -f \${boot_rw_subvol}/grubenv ]; then
+ load_env -f \${boot_rw_subvol}/grubenv
+fi
+# btrfs header always beats config file
+if [ "\${env_block}" ] ; then
+ load_env -f "\${env_block}"
+fi
+EOF
