rpms/lorax-templates-rhel
7
0
Fork 0
Code Issues Pull Requests Releases Activity

re-add temporarily removed packages

Browse Source 
These packages are now available in BaseOS or AppStream, so include them
in the boot.iso

shim-ia32
grub2-efi-ia32-cdboot
s390utils-hmcdrvfs
xorg-x11-drivers
xorg-x11-server-Xorg

xorg-x11-server-Xorg was already being pulled in as a dependency, but
I've added it back anyway, just to be sure.

dracut-fips is no longer a subpackage so it can be dropped.

docker-anaconda-addon isn't being supported for RHEL8 so drop it as
well.

The resulting image is 6M larger, and the package count goes from 738 to
756 with most of them being x11 drv packages.

Related: rhbz#1622395
This commit is contained in:
Brian C. Lane 2018-09-11 15:04:49 -07:00
parent 8a65754e91
commit 75dbf37f0a
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
80-rhel/runtime-install.tmpl
View File

@ -36,8 +36,7 @@ installpkg glibc-all-langpacks
installpkg grub2-tools-efi
installpkg efibootmgr
installpkg shim-x64 grub2-efi-x64-cdboot
# Not in RHEL8 Beta 19-Jun-2018
# installpkg shim-ia32 grub2-efi-ia32-cdboot
installpkg shim-ia32 grub2-efi-ia32-cdboot
%endif
%if basearch in ("i386", "x86_64"):
installpkg biosdevname memtest86+ syslinux
@ -51,8 +50,7 @@ installpkg glibc-all-langpacks
%endif
%if basearch == "s390x":
installpkg lsscsi s390utils-base s390utils-cmsfs-fuse
# Not in RHEL8 Beta 19-Jun-2018
# removed s390utils-hmcdrvfs
installpkg s390utils-hmcdrvfs
%endif
## yay, plymouth
@ -60,9 +58,6 @@ installpkg plymouth
## extra dracut modules
installpkg anaconda-dracut dracut-network dracut-config-generic
# FIXME - temporarily disable this while we work out entropy issues for image builds
# See BZ 1593843 for details
# REMOVED: dracut-fips
## import-state.service for switchroot
installpkg initscripts
@ -83,12 +78,9 @@ installpkg systemd
installpkg rsyslog
## xorg/GUI packages
#Very temporary remove to see if we can get a non graphical Beta installer
#imcleod - 19-Jun-2018
#UNDO ASAP
#%if basearch != "s390x":
#installpkg xorg-x11-drivers xorg-x11-server-Xorg
#%endif
%if basearch != "s390x":
installpkg xorg-x11-drivers xorg-x11-server-Xorg
%endif
installpkg xorg-x11-server-utils xorg-x11-xauth
installpkg dbus-x11 metacity gsettings-desktop-schemas
installpkg nm-connection-editor
@ -170,12 +162,5 @@ installpkg spice-vdagent
installpkg gdisk hexedit sg3_utils
installpkg perl-interpreter
## Docker enabled boot.iso
# Not all arches currently have docker
# Not in RHEL8 Beta 19-Jun-2018
#%if basearch not in ("ppc", "ppc64", "s390"):
# installpkg docker-anaconda-addon
#%endif
## actually install all the requested packages
run_pkg_transaction