Temporarily disabled oscap-anaconda-addon installation

i9 changed/i9/lorax-templates-msvsphere-9.0-35.el9.1
Eugene Zamriy 2 years ago
parent 25095554e9
commit 67eac2f5ab
Signed by: ezamriy
GPG Key ID: 7EBF95C7DCFA496C

@ -0,0 +1,26 @@
From be582be6919ba0e49447f466f868d671ad1ea1dd Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Sun, 16 Apr 2023 23:17:19 +0300
Subject: [PATCH 2/2] Disable oscap-anaconda-addon install
---
80-rhel/runtime-install.tmpl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/80-rhel/runtime-install.tmpl b/80-rhel/runtime-install.tmpl
index 1189a49..cd6feea 100644
--- a/80-rhel/runtime-install.tmpl
+++ b/80-rhel/runtime-install.tmpl
@@ -3,7 +3,8 @@
## anaconda package
installpkg anaconda anaconda-widgets kexec-tools-anaconda-addon anaconda-install-img-deps
-installpkg oscap-anaconda-addon
+## temporarily disabled on MSVSphere until we have OpenScap integration
+# installpkg oscap-anaconda-addon
## FIXME Pull in device-mapper-multipath
## This *should* be pulled in by libblockdev-plugins-all and libblockdev-mpath but it is not
--
2.39.2

@ -1,6 +1,6 @@
Name: lorax-templates-msvsphere
Version: 9.0
Release: 35%{?dist}
Release: 35%{?dist}.1
Summary: MSVSphere 9 build templates for lorax and livemedia-creator
License: GPLv2+
@ -10,6 +10,7 @@ Source0: lorax-templates-rhel-9.0-35.tar.gz
# MSVSphere patches
Patch1001: 0001-Remove-RHEL-specific-packages.patch
Patch1002: 0002-Disable-oscap-anaconda-addon-install.patch
# Required for the template branding support
Requires: lorax >= 34.9.1
@ -24,6 +25,7 @@ placed in %{templatedir}
%prep
%setup -n lorax-templates-rhel-%{version}
%patch1001 -p1
%patch1002 -p1
%build
# nothing to build
@ -38,6 +40,9 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
%{templatedir}/*
%changelog
* Sun Apr 16 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 9.0-35.1
- Temporarily disabled oscap-anaconda-addon installation
* Thu Apr 06 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 9.0-35
- Package renamed to lorax-templates-msvsphere
- Removed RHEL-specific packages

Loading…
Cancel
Save