fix: Move policy.json back to /usr/etc temporarily while issues are w…

…orked out

Containerfile

@@ -36,6 +36,7 @@ ADD files/etc/systemd /tmp/ublue-os/update-services/etc/systemd
 ADD files/usr/lib/systemd /tmp/ublue-os/update-services/usr/lib/systemd
 
 ADD files/etc/containers /tmp/ublue-os/signing/etc/containers
+ADD files/usr/etc/containers /tmp/ublue-os/signing/usr/etc/containers
 ADD files/etc/pki /tmp/ublue-os/signing/etc/pki
 
 RUN tar cf /tmp/ublue-os/rpmbuild/SOURCES/ublue-os-udev-rules.tar.gz -C /tmp ublue-os/udev-rules

rpmspec/ublue-os-signing.spec

@@ -1,7 +1,7 @@
 Name:           ublue-os-signing
 Packager:       ublue-os
 Vendor:         ublue-os
-Version:        0.3
+Version:        0.4
 Release:        1%{?dist}
 Summary:        Signing files and keys for Universal Blue
 License:        MIT
@@ -23,24 +23,28 @@ Adds files and keys for signing Universal Blue images
 mkdir -p -m0755 %{buildroot}%{_datadir}/%{VENDOR}
 mkdir -p -m0755 %{buildroot}%{_sysconfdir}/containers/registries.d
 mkdir -p -m0755 %{buildroot}%{_sysconfdir}/pki
+mkdir -p -m0755 %{buildroot}%{_exec_prefix}/etc/containers
 
 tar xf %{SOURCE0} -C %{buildroot}%{_datadir}/%{VENDOR} --strip-components=1
 tar xf %{SOURCE0} -C %{buildroot} --strip-components=2
 
 %files
 %dir %attr(0755,root,root) %{_datadir}/%{VENDOR}/%{sub_name}
-%attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_sysconfdir}/containers/policy.json
+%attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_exec_prefix}/etc/containers/policy.json
 %attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_sysconfdir}/containers/registries.d/ublue-os.yaml
 %attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_sysconfdir}/pki/containers/ublue-os.pub
 %attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_sysconfdir}/containers/registries.d/quay.io-toolbx-images.yaml
 %attr(0644,root,root) %{_datadir}/%{VENDOR}/%{sub_name}/%{_sysconfdir}/pki/containers/quay.io-toolbx-images.pub
-%attr(0644,root,root) %{_sysconfdir}/containers/policy.json
+%attr(0644,root,root) %{_exec_prefix}/etc/containers/policy.json
 %attr(0644,root,root) %{_sysconfdir}/containers/registries.d/ublue-os.yaml
 %attr(0644,root,root) %{_sysconfdir}/pki/containers/ublue-os.pub
 %attr(0644,root,root) %{_sysconfdir}/containers/registries.d/quay.io-toolbx-images.yaml
 %attr(0644,root,root) %{_sysconfdir}/pki/containers/quay.io-toolbx-images.pub
 
 %changelog
+* Thu Aug 08 2024 Kyle Gospodnetich <[email protected]> - 0.4
+- Moved policy.json back to /usr/etc/ temporarily
+
 * Wed Aug 07 2024 Kyle Gospodnetich <[email protected]> - 0.3
 - Moved files from /usr/etc/ to /etc/