From c415f6a90a1852a4c92d6b6cfd09eeeae3b84baf Mon Sep 17 00:00:00 2001 From: Gerald Pinder Date: Fri, 6 Oct 2023 23:28:38 -0400 Subject: [PATCH] Fix template --- templates/starting_point.template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/starting_point.template b/templates/starting_point.template index 5262eac..b98093b 100644 --- a/templates/starting_point.template +++ b/templates/starting_point.template @@ -42,7 +42,9 @@ RUN /bin/bash -c '/tmp/scripts/{{ script }} pre' RUN wget "{{ repo }}" -P "/etc/yum.repos.d/" {% endfor %} +{% if rpm.remove %} RUN rpm-ostree override remove {% for app in rpm.remove %}{{ app }} {% endfor %} +{% endif %} ARG FIRSTBOOT_DATA="/usr/share/ublue-os/firstboot" ARG FIRSTBOOT_LINK="/usr/etc/profile.d/ublue-firstboot.sh" @@ -66,7 +68,9 @@ RUN echo "-- firstboot: Removing all \"firstboot\" components --"; \ rm -rf "${FIRSTBOOT_DATA}" {% endif %} +{% if rpm.install %} RUN rpm-ostree install {% for app in rpm.install %}{{ app }} {% endfor %} +{% endif %} {{ print_autorun_scripts(mode = "post") }}