From 5d5ccf019f7ad1ff0b72b65688fe3df6b01dc0b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <travier@redhat.com>
Date: Tue, 16 Mar 2021 16:36:57 +0100
Subject: [PATCH] Install a temporary copy of rpm-ostree for unprivileged use

Install a copy of rpm-ostree as rpm-ostree-unpriv to get a `bin_t`
labeled binary as a temporary workaround for:
https://bugzilla.redhat.com/show_bug.cgi?id=1937404

Also modify the rpm-ostree count me service to use that binary.
---
 Makefile-rpm-ostree.am                   | 1 +
 src/daemon/rpm-ostree-countme.service.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile-rpm-ostree.am b/Makefile-rpm-ostree.am
index 9e90093d..495c96a8 100644
--- a/Makefile-rpm-ostree.am
+++ b/Makefile-rpm-ostree.am
@@ -149,6 +149,7 @@ BUILT_SOURCES += $(binding_generated_sources)
 install-rpmostree-hook:
 	install -d -m 0755 $(DESTDIR)$(bindir)
 	install -m 0755 -t $(DESTDIR)$(bindir) rpm-ostree
+	install -m 0755 rpm-ostree $(DESTDIR)$(libexecdir)/rpm-ostree-unpriv
 INSTALL_EXEC_HOOKS += install-rpmostree-hook
 
 # Wraps `cargo test`.  This is always a debug non-release build;
diff --git a/src/daemon/rpm-ostree-countme.service.in b/src/daemon/rpm-ostree-countme.service.in
index 9083e141..af5cc2ae 100644
--- a/src/daemon/rpm-ostree-countme.service.in
+++ b/src/daemon/rpm-ostree-countme.service.in
@@ -9,4 +9,4 @@ User=rpm-ostree
 DynamicUser=yes
 StateDirectory=rpm-ostree-countme
 StateDirectoryMode=750
-ExecStart=@bindir@/rpm-ostree countme
+ExecStart=@libexecdir@/rpm-ostree-unpriv countme