Merge pull request #5209 from jmarrero/kernel-integration

src/libpriv: Add kernel-install-integration
coreos · Jan 13, 2025 · cb0122a · cb0122a
2 parents b9392df + 7ab70a9
commit cb0122a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/Makefile-rpm-ostree.am b/Makefile-rpm-ostree.am
@@ -134,6 +134,7 @@ install-rpmostree-hook:
 	ln -Tsr -f $(DESTDIR)$(bindir)/rpm-ostree $(ostreeextdir)/ostree-ima-sign 
 	ln -Tsr -f $(DESTDIR)$(bindir)/rpm-ostree $(ostreeextdir)/ostree-provisional-repair 
 	ln -Tsr -f $(DESTDIR)$(bindir)/rpm-ostree $(ostreeextdir)/ostree-container
+	install -D -m 0755 -t $(DESTDIR)/usr/lib/kernel/install.d $(srcdir)/src/libpriv/05-rpmostree.install
 INSTALL_EXEC_HOOKS += install-rpmostree-hook
 
 # Wraps `cargo test`.  This is always a debug non-release build;

diff --git a/packaging/rpm-ostree.spec b/packaging/rpm-ostree.spec
@@ -241,6 +241,7 @@ $PYTHON autofiles.py > files \
   '%{_datadir}/dbus-1/system.d/*' \
   '%{_sysconfdir}/rpm-ostreed.conf' \
   '%{_prefix}/lib/systemd/system/*' \
+  '%{_prefix}/lib/kernel/install.d/*' \
   '%{_libexecdir}/rpm-ostree*' \
 %if %{with ostree_ext}
   '%{_libexecdir}/libostree/ext/*' \

diff --git a/src/libpriv/05-rpmostree.install b/src/libpriv/05-rpmostree.install
@@ -0,0 +1,3 @@
+#!/usr/bin/bash
+# This is the hook that has kernel-install call into rpm-ostree kernel-install
+exec /usr/bin/rpm-ostree kernel-install "$@"