Changes to support ostree bootable containers

plugins/pkg_commands.d/centos

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+. /etc/os-release
+
+if [ -f "/run/ostree-booted" ];then
+    # OSTree based filesystems are read-only and install with rpm-ostree
+    RSTRNT_PKG_CMD=${RSTRNT_PKG_CMD:-rpm-ostree}
+    RSTRNT_PKG_ARGS=${RSTRNT_PKG_ARGS:--y --apply-live --idempotent --allow-inactive}
+elif [ 0"$(echo $VERSION_ID | cut -d'.' -f1)" -ge 8 ]; then
+    # CentOS 8 and newer use dnf as default
+    RSTRNT_PKG_CMD=${RSTRNT_PKG_CMD:-dnf}
+fi

plugins/pkg_commands.d/fedora

@@ -2,7 +2,11 @@
 
 . /etc/os-release
 
-# Fedora 22 and newer use dnf as default
-if [ 0"$VERSION_ID" -gt 21 ]; then
+if [ -f "/run/ostree-booted" ]; then
+    # OSTree based filesystems are read-only and install with rpm-ostree
+    RSTRNT_PKG_CMD=${RSTRNT_PKG_CMD:-rpm-ostree}
+    RSTRNT_PKG_ARGS=${RSTRNT_PKG_ARGS:--y --apply-live --idempotent --allow-inactive}
+elif [ 0"$VERSION_ID" -gt 21 ]; then
+    # Fedora 22 and newer use dnf as default
     RSTRNT_PKG_CMD=${RSTRNT_PKG_CMD:-dnf}
 fi

plugins/pkg_commands.d/rhel

@@ -2,7 +2,11 @@
 
 . /etc/os-release
 
-# RHEL 8 and newer use dnf as default
-if [ 0"$(echo $VERSION_ID | cut -d'.' -f1)" -ge 8 ]; then
+if [ -f "/run/ostree-booted" ];then
+    # OSTree based filesystems are read-only and install with rpm-ostree
+    RSTRNT_PKG_CMD=${RSTRNT_PKG_CMD:-rpm-ostree}
+    RSTRNT_PKG_ARGS=${RSTRNT_PKG_ARGS:--y --apply-live --idempotent --allow-inactive}
+elif [ 0"$(echo $VERSION_ID | cut -d'.' -f1)" -ge 8 ]; then
+    # RHEL 8 and newer use dnf as default
     RSTRNT_PKG_CMD=${RSTRNT_PKG_CMD:-dnf}
 fi

restraint.conf

@@ -0,0 +1,3 @@
+# Type Path Mode User Group Age Argument
+d /mnt/scratchspace 0777 root root -
+d /mnt/testarea 1777 root root -

restraint.spec

@@ -22,6 +22,7 @@ Group:		Applications/Internet
 License:	GPLv3+ and MIT
 URL:		https://github.com/beaker-project/%{name}
 Source0:	https://github.com/beaker-project/restraint/archive/%{name}-%{version}.tar.gz
+Source1:	%{name}.conf
 
 %if 0%{?with_static:1}
 # Sources for bundled, statically linked libraries
@@ -249,6 +250,12 @@ fi
 popd
 %endif
 
+%if %{with_systemd}
+mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_tmpfilesdir}/%{name}.conf
+%endif
+
+
 %post
 if [ "$1" -le "1" ] ; then # First install
 %if %{with_systemd}
@@ -381,8 +388,12 @@ fi
 %{_bindir}/rhts_recipe_sync_block
 %{_bindir}/rhts-abort
 %{_datadir}/rhts/lib/rhts-make.include
+%if %{with_systemd}
+%config %{_tmpfilesdir}/%{name}.conf
+%else
 /mnt/scratchspace
 %attr(1777,root,root)/mnt/testarea
+%endif
 %if 0%{?rhel}%{?fedora} > 4
 %{_datadir}/selinux/packages/%{name}/rhts.pp
 %endif