diff --git a/internal/distro/rhel85/distro.go b/internal/distro/rhel85/distro.go index f095840b7..db9d59eb7 100644 --- a/internal/distro/rhel85/distro.go +++ b/internal/distro/rhel85/distro.go @@ -784,7 +784,7 @@ func newDistro(name, modulePlatformID, ostreeRef string) distro.Distro { packageSets: map[string]packageSetFunc{ buildPkgsKey: anacondaBuildPackageSet, osPkgsKey: bareMetalPackageSet, - installerPkgsKey: installerPackageSet, + installerPkgsKey: anacondaPackageSet, }, rpmOstree: false, bootISO: true, diff --git a/internal/distro/rhel85/package_sets.go b/internal/distro/rhel85/package_sets.go index eedd0487f..30948d7dd 100644 --- a/internal/distro/rhel85/package_sets.go +++ b/internal/distro/rhel85/package_sets.go @@ -407,106 +407,18 @@ func bareMetalPackageSet(t *imageType) rpmmd.PackageSet { } // INSTALLER PACKAGE SET -func installerPackageSet(t *imageType) rpmmd.PackageSet { - // TODO: simplify - return rpmmd.PackageSet{ - Include: []string{ - "aajohan-comfortaa-fonts", "abattis-cantarell-fonts", - "alsa-firmware", "alsa-tools-firmware", "anaconda", - "anaconda-dracut", "anaconda-install-env-deps", "anaconda-widgets", - "audit", "bind-utils", "biosdevname", "bitmap-fangsongti-fonts", - "bzip2", "cryptsetup", "curl", "dbus-x11", "dejavu-sans-fonts", - "dejavu-sans-mono-fonts", "device-mapper-persistent-data", - "dmidecode", "dnf", "dracut-config-generic", "dracut-network", - "dump", "efibootmgr", "ethtool", "ftp", "gdb-gdbserver", "gdisk", - "gfs2-utils", "glibc-all-langpacks", - "google-noto-sans-cjk-ttc-fonts", "grub2-efi-ia32-cdboot", - "grub2-efi-x64-cdboot", "grub2-tools", "grub2-tools-efi", - "grub2-tools-extra", "grub2-tools-minimal", "grubby", - "gsettings-desktop-schemas", "hdparm", "hexedit", "hostname", - "initscripts", "ipmitool", "iwl1000-firmware", "iwl100-firmware", - "iwl105-firmware", "iwl135-firmware", "iwl2000-firmware", - "iwl2030-firmware", "iwl3160-firmware", "iwl3945-firmware", - "iwl4965-firmware", "iwl5000-firmware", "iwl5150-firmware", - "iwl6000-firmware", "iwl6000g2a-firmware", "iwl6000g2b-firmware", - "iwl6050-firmware", "iwl7260-firmware", "jomolhari-fonts", - "kacst-farsi-fonts", "kacst-qurn-fonts", "kbd", "kbd-misc", - "kdump-anaconda-addon", "kernel", "khmeros-base-fonts", "less", - "libblockdev-lvm-dbus", "libertas-sd8686-firmware", - "libertas-sd8787-firmware", "libertas-usb8388-firmware", - "libertas-usb8388-olpc-firmware", "libibverbs", - "libreport-plugin-bugzilla", "libreport-plugin-reportuploader", - "libreport-rhel-anaconda-bugzilla", "librsvg2", "linux-firmware", - "lklug-fonts", "lohit-assamese-fonts", "lohit-bengali-fonts", - "lohit-devanagari-fonts", "lohit-gujarati-fonts", - "lohit-gurmukhi-fonts", "lohit-kannada-fonts", "lohit-odia-fonts", - "lohit-tamil-fonts", "lohit-telugu-fonts", "lsof", "madan-fonts", - "memtest86+", "metacity", "mtr", "mt-st", "net-tools", "nfs-utils", - "nmap-ncat", "nm-connection-editor", "nss-tools", - "openssh-clients", "openssh-server", "oscap-anaconda-addon", - "ostree", "pciutils", "perl-interpreter", "pigz", "plymouth", - "prefixdevname", "python3-pyatspi", "rdma-core", - "redhat-release-eula", "rng-tools", "rpcbind", "rpm-ostree", - "rsync", "rsyslog", "selinux-policy-targeted", "sg3_utils", - "shim-ia32", "shim-x64", "sil-abyssinica-fonts", - "sil-padauk-fonts", "sil-scheherazade-fonts", "smartmontools", - "smc-meera-fonts", "spice-vdagent", "strace", "syslinux", - "systemd", "system-storage-manager", "tar", - "thai-scalable-waree-fonts", "tigervnc-server-minimal", - "tigervnc-server-module", "udisks2", "udisks2-iscsi", "usbutils", - "vim-minimal", "volume_key", "wget", "xfsdump", "xfsprogs", - "xorg-x11-drivers", "xorg-x11-fonts-misc", "xorg-x11-server-utils", - "xorg-x11-server-Xorg", "xorg-x11-xauth", "xz", - }, - } -} -func edgeSimplifiedInstallerPackageSet(t *imageType) rpmmd.PackageSet { +func installerPackageSet(t *imageType) rpmmd.PackageSet { return rpmmd.PackageSet{ Include: []string{ - "cloud-utils-growpart", - "dracut-live", - "xfsprogs", - "bsdtar", - "coreos-installer", - "coreos-installer-bootinfra", + "anaconda-dracut", + "biosdevname", + "curl", "dracut-config-generic", "dracut-network", - "kernel", - "binutils", - "basesystem", - "sudo", - "systemd", - "coreutils", - "util-linux", - "curl", - "e2fsprogs", - "dosfstools", - "attr", - "xz", - "gzip", - "iptables", - "dnsmasq", - "traceroute", "hostname", - "iproute", - "iputils", - "openssh-clients", - "procps-ng", - "rootfiles", - "passwd", - "policycoreutils", - "policycoreutils-python-utils", - "selinux-policy-targeted", - "setools-console", - "less", - "tar", - "ima-evm-utils", - "shim-x64", - "ostree", - "microcode_ctl", - "iwl1000-firmware", "iwl100-firmware", + "iwl1000-firmware", "iwl105-firmware", "iwl135-firmware", "iwl2000-firmware", @@ -517,76 +429,208 @@ func edgeSimplifiedInstallerPackageSet(t *imageType) rpmmd.PackageSet { "iwl6000-firmware", "iwl6050-firmware", "iwl7260-firmware", - - // for the dracut modules - "keyutils", - "rng-tools", - "lvm2", - "device-mapper-multipath", - "lldpad", - "fcoe-utils", - "iscsi-initiator-utils", - "rpcbind", - "biosdevname", + "kernel", + "less", "nfs-utils", + "openssh-clients", + "ostree", "plymouth", "prefixdevname", - "anaconda-dracut", + "rng-tools", + "rpcbind", + "selinux-policy-targeted", + "shim-x64", + "systemd", + "tar", + "xfsprogs", + "xz", }, - Exclude: nil, } } +func anacondaPackageSet(t *imageType) rpmmd.PackageSet { + + // common installer packages + ps := installerPackageSet(t) + + ps = ps.Append(rpmmd.PackageSet{ + Include: []string{ + "aajohan-comfortaa-fonts", + "abattis-cantarell-fonts", + "alsa-firmware", + "alsa-tools-firmware", + "anaconda", + "anaconda-install-env-deps", + "anaconda-widgets", + "audit", + "bind-utils", + "bitmap-fangsongti-fonts", + "bzip2", + "cryptsetup", + "dbus-x11", + "dejavu-sans-fonts", + "dejavu-sans-mono-fonts", + "device-mapper-persistent-data", + "dmidecode", + "dnf", + "dump", + "efibootmgr", + "ethtool", + "ftp", + "gdb-gdbserver", + "gdisk", + "gfs2-utils", + "glibc-all-langpacks", + "google-noto-sans-cjk-ttc-fonts", + "grub2-efi-ia32-cdboot", + "grub2-efi-x64-cdboot", + "grub2-tools", + "grub2-tools-efi", + "grub2-tools-extra", + "grub2-tools-minimal", + "grubby", + "gsettings-desktop-schemas", + "hdparm", + "hexedit", + "grub2-tools-extra", + "grub2-tools-minimal", + "grubby", + "gsettings-desktop-schemas", + "hdparm", + "hexedit", + "initscripts", + "ipmitool", + "iwl3945-firmware", + "iwl4965-firmware", + "iwl6000g2a-firmware", + "iwl6000g2b-firmware", + "jomolhari-fonts", + "kacst-farsi-fonts", + "kacst-qurn-fonts", + "kbd", + "kbd-misc", + "kdump-anaconda-addon", + "khmeros-base-fonts", + "libblockdev-lvm-dbus", + "libertas-sd8686-firmware", + "libertas-sd8787-firmware", + "libertas-usb8388-firmware", + "libertas-usb8388-olpc-firmware", + "libibverbs", + "libreport-plugin-bugzilla", + "libreport-plugin-reportuploader", + "libreport-rhel-anaconda-bugzilla", + "librsvg2", + "linux-firmware", + "lklug-fonts", + "lohit-assamese-fonts", + "lohit-bengali-fonts", + "lohit-devanagari-fonts", + "lohit-gujarati-fonts", + "lohit-gurmukhi-fonts", + "lohit-kannada-fonts", + "lohit-odia-fonts", + "lohit-tamil-fonts", + "lohit-telugu-fonts", + "lsof", + "madan-fonts", + "memtest86+", + "metacity", + "mt-st", + "mtr", + "net-tools", + "nm-connection-editor", + "nmap-ncat", + "nss-tools", + "openssh-server", + "oscap-anaconda-addon", + "pciutils", + "perl-interpreter", + "pigz", + "python3-pyatspi", + "rdma-core", + "redhat-release-eula", + "rpm-ostree", + "rsync", + "rsyslog", + "sg3_utils", + "shim-ia32", + "sil-abyssinica-fonts", + "sil-padauk-fonts", + "sil-scheherazade-fonts", + "smartmontools", + "smc-meera-fonts", + "spice-vdagent", + "strace", + "syslinux", + "system-storage-manager", + "thai-scalable-waree-fonts", + "tigervnc-server-minimal", + "tigervnc-server-module", + "udisks2", + "udisks2-iscsi", + "usbutils", + "vim-minimal", + "volume_key", + "wget", + "xfsdump", + "xorg-x11-drivers", + "xorg-x11-fonts-misc", + "xorg-x11-server-Xorg", + "xorg-x11-server-utils", + "xorg-x11-xauth", + }, + }) + + return ps +} + func edgeInstallerPackageSet(t *imageType) rpmmd.PackageSet { - return rpmmd.PackageSet{ + return anacondaPackageSet(t) +} + +func edgeSimplifiedInstallerPackageSet(t *imageType) rpmmd.PackageSet { + // common installer packages + ps := installerPackageSet(t) + + ps = ps.Append(rpmmd.PackageSet{ Include: []string{ - "aajohan-comfortaa-fonts", "abattis-cantarell-fonts", - "alsa-firmware", "alsa-tools-firmware", "anaconda", - "anaconda-dracut", "anaconda-install-env-deps", "anaconda-widgets", - "audit", "bind-utils", "biosdevname", "bitmap-fangsongti-fonts", - "bzip2", "cryptsetup", "curl", "dbus-x11", "dejavu-sans-fonts", - "dejavu-sans-mono-fonts", "device-mapper-persistent-data", - "dmidecode", "dnf", "dracut-config-generic", "dracut-network", - "dump", "efibootmgr", "ethtool", "ftp", "gdb-gdbserver", "gdisk", - "gfs2-utils", "glibc-all-langpacks", - "google-noto-sans-cjk-ttc-fonts", "grub2-efi-ia32-cdboot", - "grub2-efi-x64-cdboot", "grub2-tools", "grub2-tools-efi", - "grub2-tools-extra", "grub2-tools-minimal", "grubby", - "gsettings-desktop-schemas", "hdparm", "hexedit", "hostname", - "initscripts", "ipmitool", "iwl1000-firmware", "iwl100-firmware", - "iwl105-firmware", "iwl135-firmware", "iwl2000-firmware", - "iwl2030-firmware", "iwl3160-firmware", "iwl3945-firmware", - "iwl4965-firmware", "iwl5000-firmware", "iwl5150-firmware", - "iwl6000-firmware", "iwl6000g2a-firmware", "iwl6000g2b-firmware", - "iwl6050-firmware", "iwl7260-firmware", "jomolhari-fonts", - "kacst-farsi-fonts", "kacst-qurn-fonts", "kbd", "kbd-misc", - "kdump-anaconda-addon", "kernel", "khmeros-base-fonts", "less", - "libblockdev-lvm-dbus", "libertas-sd8686-firmware", - "libertas-sd8787-firmware", "libertas-usb8388-firmware", - "libertas-usb8388-olpc-firmware", "libibverbs", - "libreport-plugin-bugzilla", "libreport-plugin-reportuploader", - "libreport-rhel-anaconda-bugzilla", "librsvg2", "linux-firmware", - "lklug-fonts", "lohit-assamese-fonts", "lohit-bengali-fonts", - "lohit-devanagari-fonts", "lohit-gujarati-fonts", - "lohit-gurmukhi-fonts", "lohit-kannada-fonts", "lohit-odia-fonts", - "lohit-tamil-fonts", "lohit-telugu-fonts", "lsof", "madan-fonts", - "memtest86+", "metacity", "mtr", "mt-st", "net-tools", "nfs-utils", - "nmap-ncat", "nm-connection-editor", "nss-tools", - "openssh-clients", "openssh-server", "oscap-anaconda-addon", - "ostree", "pciutils", "perl-interpreter", "pigz", "plymouth", - "prefixdevname", "python3-pyatspi", "rdma-core", - "redhat-release-eula", "rng-tools", "rpcbind", "rpm-ostree", - "rsync", "rsyslog", "selinux-policy-targeted", "sg3_utils", - "shim-ia32", "shim-x64", "sil-abyssinica-fonts", - "sil-padauk-fonts", "sil-scheherazade-fonts", "smartmontools", - "smc-meera-fonts", "spice-vdagent", "strace", "syslinux", - "systemd", "system-storage-manager", "tar", - "thai-scalable-waree-fonts", "tigervnc-server-minimal", - "tigervnc-server-module", "udisks2", "udisks2-iscsi", "usbutils", - "vim-minimal", "volume_key", "wget", "xfsdump", "xfsprogs", - "xorg-x11-drivers", "xorg-x11-fonts-misc", "xorg-x11-server-utils", - "xorg-x11-server-Xorg", "xorg-x11-xauth", "xz", + "attr", + "basesystem", + "binutils", + "bsdtar", + "cloud-utils-growpart", + "coreos-installer", + "coreos-installer-bootinfra", + "coreutils", + "device-mapper-multipath", + "dnsmasq", + "dosfstools", + "dracut-live", + "e2fsprogs", + "fcoe-utils", + "gzip", + "ima-evm-utils", + "iproute", + "iptables", + "iputils", + "iscsi-initiator-utils", + "keyutils", + "lldpad", + "lvm2", + "microcode_ctl", + "passwd", + "policycoreutils", + "policycoreutils-python-utils", + "procps-ng", + "rootfiles", + "setools-console", + "sudo", + "traceroute", + "util-linux", }, Exclude: nil, - } + }) + + return ps }