diff --git a/fedora.yaml b/fedora.yaml index 9ab0de1..f3ee24e 100644 --- a/fedora.yaml +++ b/fedora.yaml @@ -27,7 +27,6 @@ packages: - fedora-repos-modular # file-transfer: note fuse-sshfs is not in RHEL # so we can't put it in file-transfer.yaml - - fuse-sshfs # Storage - btrfs-progs # In F35+ need `iptables-legacy` package diff --git a/oscore/file-transfer.yaml b/oscore/file-transfer.yaml deleted file mode 100644 index 88e27b9..0000000 --- a/oscore/file-transfer.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Moving files around and verifying them -packages: - - git-core - - gnupg2 - - rsync - # Explicit dependency on curl because we use it in coreos-livepxe-rootfs.sh - # We need curl and not curl-minimal because we support TFTP. - - curl diff --git a/oscore/manifest.yaml b/oscore/manifest.yaml index 6dffa9e..aec2426 100644 --- a/oscore/manifest.yaml +++ b/oscore/manifest.yaml @@ -28,11 +28,9 @@ check-groups: include: - bootc.yaml - bootable-rpm-ostree.yaml - - file-transfer.yaml - networking-tools.yaml - system-configuration.yaml - user-experience.yaml - - shared-workarounds.yaml - fwupd.yaml remove-from-packages: @@ -75,13 +73,9 @@ packages: - netavark # Minimal NFS client - nfs-utils-coreos - # Active Directory support - - adcli # Additional firewall support; we aren't including these in RHCOS or they # don't exist in RHEL - iptables-nft iptables-services - # WireGuard https://github.com/coreos/fedora-coreos-tracker/issues/362 - - wireguard-tools - WALinuxAgent-udev # Allow communication between sudo and SSSD # for caching sudo rules by SSSD. diff --git a/oscore/shared-workarounds.yaml b/oscore/shared-workarounds.yaml deleted file mode 100644 index 06c1ca6..0000000 --- a/oscore/shared-workarounds.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# This manifest is a list of shared workarounds that are needed in both Fedora CoreOS -# and downstreams (i.e. Red Hat CoreOS). - -postprocess: - # Put in the fix for multipathd.service in dracut on releases that haven't - # been fixed yet. - # https://github.com/dracutdevs/dracut/pull/1606 - # https://github.com/coreos/fedora-coreos-config/pull/1233 - - | - #!/usr/bin/env bash - set -xeuo pipefail - source /etc/os-release - # This has landed in Fedora but not in any version of RHEL yet - if [[ ${ID} != "rhel" ]]; then - exit 0 - fi - mkdir /usr/lib/dracut/modules.d/36coreos-multipath-fix - cat > /usr/lib/dracut/modules.d/36coreos-multipath-fix/90-multipathd-remove-execstop.conf <<'EOF' - # Temporary workaround for https://github.com/dracutdevs/dracut/pull/1606. - [Service] - ExecStop= - EOF - cat > /usr/lib/dracut/modules.d/36coreos-multipath-fix/module-setup.sh <<'EOF' - #!/bin/bash - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - install() { - # Temporary workaround for https://github.com/dracutdevs/dracut/pull/1606. - mkdir -p "$systemdsystemunitdir/multipathd.service.d" - inst_simple "$moddir/90-multipathd-remove-execstop.conf" \ - "$systemdsystemunitdir/multipathd.service.d/90-multipathd-remove-execstop.conf" - } - EOF - chmod +x /usr/lib/dracut/modules.d/36coreos-multipath-fix/module-setup.sh diff --git a/oscore/system-configuration.yaml b/oscore/system-configuration.yaml index b9fd6e2..d643f94 100644 --- a/oscore/system-configuration.yaml +++ b/oscore/system-configuration.yaml @@ -1,6 +1,4 @@ # These are packages that are related to configuring parts of the system. -# It is intended to be kept generic so that it may be shared downstream with -# RHCOS. packages: # Configuring SSH keys, cloud provider check-in, etc @@ -9,15 +7,8 @@ packages: # NTP support - chrony # Storage configuration/management - ## cloud-utils-growpart - For growing root partition - - cifs-utils - - cloud-utils-growpart - cryptsetup - - device-mapper-multipath - e2fsprogs - - iscsi-initiator-utils - - lvm2 - - mdadm - sg3_utils - xfsprogs # User configuration diff --git a/oscore/user-experience.yaml b/oscore/user-experience.yaml index d0c57a7..9c57cc5 100644 --- a/oscore/user-experience.yaml +++ b/oscore/user-experience.yaml @@ -16,10 +16,8 @@ packages: - bash-completion - coreutils - file - - jq - less - sudo - - vim-minimal # File compression/decompression ## bsdtar - dependency of 35coreos-live dracut module - bsdtar @@ -39,8 +37,6 @@ packages: # Container tooling - crun - podman - - runc - skopeo - - toolbox # nvme-cli for managing nvme disks - nvme-cli