diff --git a/_servicedata b/_servicedata
index 22a5350..ad2a729 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/lnussel/sdbootutil.git
- f5c7e48bca77729870773e940df9426ee83c5ae5
\ No newline at end of file
+ a0e666f3d0a6ec524f26b7c30d0ff1ee02b9e96e
\ No newline at end of file
diff --git a/sdbootutil-1+git20230711.f5c7e48.obscpio b/sdbootutil-1+git20230711.f5c7e48.obscpio
deleted file mode 100644
index e513f44..0000000
--- a/sdbootutil-1+git20230711.f5c7e48.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:10ba0f22cf74511399c425a064400f3381c29c5fc8a95adfd014434f7568cdd0
-size 322571
diff --git a/sdbootutil-1+git20230727.a0e666f.obscpio b/sdbootutil-1+git20230727.a0e666f.obscpio
new file mode 100644
index 0000000..be4076e
--- /dev/null
+++ b/sdbootutil-1+git20230727.a0e666f.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dfa6d39b576ca3a48194db9fbb4badc1c6a368a02161fc07e8b6f33c11da2fb5
+size 336395
diff --git a/sdbootutil.changes b/sdbootutil.changes
index 0f69a92..f214dd7 100644
--- a/sdbootutil.changes
+++ b/sdbootutil.changes
@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Thu Jul 27 14:32:09 UTC 2023 - lnussel@suse.com
+
+- Update to version 1+git20230727.a0e666f:
+ * Set and honor $SYSTEMD_ESP_PATH
+ * rpm-script: don't remove kernel on reinstalls
+
+-------------------------------------------------------------------
+Wed Jul 26 16:22:10 UTC 2023 - lnussel@suse.com
+
+- Update to version 1+git20230726.a994d2e:
+ * Fix installing extra kernels in MicroOS
+ * Replace file triggers with scriptlet
+ * Fix cleanup of rollback files
+ * Don't install unchanged files
+ * Add is-bootable and list-kernels commands
+ * Add ARCHITECTURE.md which explains how the setup works
+ * Add default loader config when installed
+
+-------------------------------------------------------------------
+Mon Jul 17 09:16:02 UTC 2023 - lnussel@suse.com
+
+- Update to version 1+git20230717.dac075e:
+ * Install default boot loader in non-secure-boot case too
+
+-------------------------------------------------------------------
+Thu Jul 13 12:04:12 UTC 2023 - lnussel@suse.de
+
+- Update to version 1+git20230713.df6eaca:
+ * Update features
+ * Call stty only in interactive mode
+ * silence stty errors
+
+-------------------------------------------------------------------
+Thu Jul 13 08:09:49 UTC 2023 - lnussel@suse.de
+
+- Update to version 1+git20230713.356f0c5:
+ * Fix rpm dependencies
+
-------------------------------------------------------------------
Tue Jul 11 11:41:45 UTC 2023 - lnussel@suse.com
diff --git a/sdbootutil.obsinfo b/sdbootutil.obsinfo
index 8bde3ba..790be94 100644
--- a/sdbootutil.obsinfo
+++ b/sdbootutil.obsinfo
@@ -1,4 +1,4 @@
name: sdbootutil
-version: 1+git20230711.f5c7e48
-mtime: 1689075604
-commit: f5c7e48bca77729870773e940df9426ee83c5ae5
+version: 1+git20230727.a0e666f
+mtime: 1690467432
+commit: a0e666f3d0a6ec524f26b7c30d0ff1ee02b9e96e
diff --git a/sdbootutil.spec b/sdbootutil.spec
index ad2ce01..4f7eedc 100644
--- a/sdbootutil.spec
+++ b/sdbootutil.spec
@@ -27,28 +27,20 @@ BuildRequires: git-core
%define git_version %{nil}
%endif
Name: sdbootutil
-Version: 1+git20230711.f5c7e48%{git_version}
+Version: 1+git20230727.a0e666f%{git_version}
Release: 0
Summary: script to install shim with sd-boot
License: MIT
URL: https://en.opensuse.org/openSUSE:Usr_merge
Source: %{name}-%{version}.tar
-# XXX systemd-boot is in udev
Requires: jq
Requires: sed
-Supplements: (udev and shim)
+Requires: systemd-boot
+Supplements: (systemd-boot and shim)
%description
Hook scripts to install shim along with systemd-boot
-%package filetriggers
-Summary: File triggers for sdbootutil
-Requires: sdbootutil >= %{version}-%{release}
-Conflicts: (suse-module-tools with suse-kernel-rpm-scriptlets)
-
-%description filetriggers
-File trigger scripts for sdbootutil
-
%package snapper
Summary: plugin script for snapper
Requires: %{name} = %{version}
@@ -62,8 +54,12 @@ Plugin scripts for snapper to handle BLS config files
%package rpm-scriptlets
Summary: dummy scriptlets for the kernel
+# make sure to not replace scriptlets with nops on systems that
+# use grub2
+Conflicts: grub2
Conflicts: suse-kernel-rpm-scriptlets
Provides: suse-kernel-rpm-scriptlets
+Obsoletes: %{name}-filetriggers < %{version}
%description rpm-scriptlets
Empty scriptlets to satisfy kernel dependencies
@@ -74,11 +70,16 @@ Empty scriptlets to satisfy kernel dependencies
%build
%install
-install -D -m 644 kernelhooks.lua %{buildroot}%{_rpmconfigdir}/lua/kernelhooks.lua
install -D -m 755 sdbootutil %{buildroot}%{_bindir}/sdbootutil
mkdir -p %{buildroot}%{_prefix}/lib/module-init-tools/kernel-scriptlets
-for a in cert inkmp kmp rpm; do
+for a in rpm; do
+ install -m 755 "$a-script" %{buildroot}%{_prefix}/lib/module-init-tools/kernel-scriptlets
+ for b in post posttrans postun pre preun; do
+ ln -s "$a-script" %{buildroot}%{_prefix}/lib/module-init-tools/kernel-scriptlets/$a-$b
+ done
+done
+for a in cert inkmp kmp; do
for b in post posttrans postun pre preun; do
ln -s /bin/true %{buildroot}%{_prefix}/lib/module-init-tools/kernel-scriptlets/$a-$b
done
@@ -90,42 +91,10 @@ for i in 10-sdbootutil.snapper; do
install -m 755 $i %{buildroot}%{_prefix}/lib/snapper/plugins/$i
done
-%transfiletriggerin filetriggers -p -- %{_prefix}/lib/modules/
-require("kernelhooks")
-if posix.getenv("VERBOSE_FILETRIGGERS") then
- kernelhooks.debug = "%{nvr}(in)"
-end
-file = rpm.next_file()
-while file do
- kernelhooks.filter(file)
- file = rpm.next_file()
-end
-kernelhooks.add()
-io.flush()
-
-%transfiletriggerun filetriggers -p -- %{_prefix}/lib/modules/
--- the module is already gone if we get called for ourselves
-if pcall(require, 'kernelhooks') then
- if posix.getenv("VERBOSE_FILETRIGGERS") then
- kernelhooks.debug = "%{nvr}(postun)"
- end
- file = rpm.next_file()
- while file do
- kernelhooks.filter(file)
- file = rpm.next_file()
- end
- kernelhooks.remove()
- io.flush()
-end
-
%files
%license LICENSE
%{_bindir}/sdbootutil
-%files filetriggers
-%dir %{_rpmconfigdir}/lua
-%{_rpmconfigdir}/lua/kernelhooks.lua
-
%files rpm-scriptlets
%dir %{_prefix}/lib/module-init-tools
%{_prefix}/lib/module-init-tools/*