Skip to content

Commit

Permalink
FIXME: Patch Lorax templates to exclude tigervnc
Browse files Browse the repository at this point in the history
That should hopefully do it together with the Anaconda spec file change.

FIXME: Temporary commit needed for testing and image generation
purposes. Should not be part of the final PR before merging.
  • Loading branch information
M4rtinK committed Jan 19, 2024
1 parent 0eacfe5 commit 27e5649
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 0 deletions.
1 change: 1 addition & 0 deletions dockerfile/anaconda-iso-creator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ RUN set -ex; \
COPY ["lorax-build", "/"]
COPY ["lorax-build-webui", "/"]
COPY ["adjust-templates-for-webui.patch", "/"]
COPY ["drop-tiger-vnc-from-templates.patch", "/"]

RUN mkdir /lorax /anaconda-rpms /images

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From 9212dc01de34f49e2fb2dc63068c48560927ad34 Mon Sep 17 00:00:00 2001
From: Martin Kolman <mkolman@redhat.com>
Date: Wed, 17 Jan 2024 18:09:53 +0100
Subject: [PATCH] Drop tiger-vnc from templates

---
share/templates.d/99-generic/runtime-cleanup.tmpl | 1 -
share/templates.d/99-generic/runtime-install.tmpl | 2 --
2 files changed, 3 deletions(-)

diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl
index aad31f77..bc0b11b5 100644
--- a/share/templates.d/99-generic/runtime-cleanup.tmpl
+++ b/share/templates.d/99-generic/runtime-cleanup.tmpl
@@ -56,7 +56,6 @@ removepkg libasyncns
removepkg lvm2-libs
removepkg mobile-broadband-provider-info
removepkg rmt rpcbind squashfs-tools
-removepkg tigervnc-license xml-common
removepkg mkfontscale fonttosfnt
removepkg xorg-x11-server-common
# do not remove this, required for ppc64le and s390x !!!
diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl
index d6029830..4df2fb99 100644
--- a/share/templates.d/99-generic/runtime-install.tmpl
+++ b/share/templates.d/99-generic/runtime-install.tmpl
@@ -131,8 +131,6 @@ installpkg selinux-policy-targeted audit

## network tools/servers
installpkg ethtool openssh-server nfs-utils openssh-clients
-installpkg tigervnc-server-minimal
-installpkg tigervnc-server-module
installpkg net-tools
installpkg bridge-utils
installpkg nmap-ncat
--
2.43.0

4 changes: 4 additions & 0 deletions dockerfile/anaconda-iso-creator/lorax-build
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,16 @@ mkdir -p $REPO_DIR
cp -a $INPUT_RPMS/* $REPO_DIR || echo "RPM files can't be copied!" # We could just do the build with official repositories only
createrepo_c $REPO_DIR

cp -r /usr/share/lorax/templates.d/ /lorax/
patch -p2 -i /drop-tiger-vnc-from-templates.patch

# build boot.iso with our rpms
. /etc/os-release
# The download.fedoraproject.org automatic redirector often selects download-ib01.f.o. for GitHub's cloud, which is too unreliable; use a mirror
# The --volid argument can cause different network interface naming: https://github.com/rhinstaller/kickstart-tests/issues/448
lorax -p Fedora -v "$VERSION_ID" -r "$VERSION_ID" \
--volid Fedora-S-dvd-x86_64-rawh \
--sharedir ./templates.d/99-generic/ \
-s http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/ \
-s file://$REPO_DIR/ \
"$@" \
Expand Down

0 comments on commit 27e5649

Please sign in to comment.