Skip to content

Commit

Permalink
tier-1: drop a bunch of redundant packages
Browse files Browse the repository at this point in the history
These are all included in tier-x or tier-0 already.

Though it does drop bsdtar. This isn't really well-known enough to
belong here. It's included in FCOS because we use it in our scripts,
but it's not a requirement for any tier-1 logic AFAIK and I would be
surprised if users expected it there.
  • Loading branch information
jlebon committed Sep 18, 2024
1 parent 034cf4b commit 83542ad
Show file tree
Hide file tree
Showing 9 changed files with 4 additions and 70 deletions.
8 changes: 0 additions & 8 deletions tier-1/bootable-rpm-ostree.yaml

This file was deleted.

28 changes: 2 additions & 26 deletions tier-1/coreos-user-experience.yaml
Original file line number Diff line number Diff line change
@@ -1,40 +1,16 @@
# This file was forked/copied from Fedora CoreOS. TODO: resync
# once we have a good generic mechanism for sharing.
packages:
# Basic user tools
## jq - parsing/interacting with JSON data
- bash-completion
- coreutils
- file
- jq
- less
- sudo
- vim-minimal
# File compression/decompression
## bsdtar - dependency of 35coreos-live dracut module
- bsdtar
- bzip2
- gzip
- tar
- xz
- zstd
# Additional file compression/decompression
- bzip2 zstd
# Improved MOTD experience
- console-login-helper-messages-issuegen
- console-login-helper-messages-profile
# kdump support
# https://github.com/coreos/fedora-coreos-tracker/issues/622
- kexec-tools
# Remote Access
- openssh-clients openssh-server
# Container tooling
## crun recommends but doesn't require criu and criu-libs. We want them for
## checkpoint/restore. https://github.com/coreos/fedora-coreos-tracker/issues/1370
- crun criu criu-libs
- podman
- skopeo
- toolbox
# passt provides user-mode networking daemons for namespaces
- passt
# nvme-cli for managing nvme disks
- nvme-cli
# Used by admins interactively
Expand Down
7 changes: 0 additions & 7 deletions tier-1/firmware.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions tier-1/fwupd.yaml

This file was deleted.

12 changes: 1 addition & 11 deletions tier-1/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,20 @@ recommends: true
include:
- ../tier-x/manifest.yaml
- autoupdates.yaml
- bootable-rpm-ostree.yaml
- podman.yaml
- firmware.yaml
- networking-tools.yaml
- system-configuration.yaml
- coreos-user-experience.yaml
- fwupd.yaml
- persistent-journal.yaml
- initramfs-full.yaml
- generic-growfs.yaml

packages:
# Include and set the default editor
- nano
# And we expect this in general
- vim-minimal
- nfs-utils
# Additional firewall support; we aren't including these in RHCOS or they
# don't exist in RHEL
- iptables-nft iptables-services
- iptables-services
- WALinuxAgent-udev
# Allow communication between sudo and SSSD
# for caching sudo rules by SSSD.
Expand All @@ -32,18 +26,14 @@ packages:
# SSSD; we only ship a subset of the backends
- sssd-client sssd-ad sssd-ipa sssd-krb5 sssd-ldap
# Used by admins interactively
- attr
- openssl
- lsof
# Provides terminal tools like clear, reset, tput, and tset
- ncurses
# i18n
- kbd
# zram-generator (but not zram-generator-defaults) for F33 change
# https://github.com/coreos/fedora-coreos-tracker/issues/509
- zram-generator
# resolved was broken out to its own package in rawhide/f35
- systemd-resolved
# This one is in Python so isn't in FCOS, but we can safely add it here.
- sos

Expand Down
2 changes: 0 additions & 2 deletions tier-1/networking-tools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
# generic enough to be shared downstream with RHCOS.

packages:
# Standard tools for configuring network/hostname
- NetworkManager hostname
# Interactive Networking configuration during coreos-install
- NetworkManager-tui
# Support for cloud quirks and dynamic config in real rootfs:
Expand Down
7 changes: 0 additions & 7 deletions tier-1/podman.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions tier-1/system-configuration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@ packages:
# NTP support
- chrony
# Storage configuration/management
- lvm2
- cryptsetup
- e2fsprogs
- sg3_utils
- xfsprogs
## This is generally useful... https://github.com/CentOS/centos-bootc/issues/394
- cloud-utils-growpart
# User configuration
Expand Down
1 change: 1 addition & 0 deletions tier-x/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,5 @@ packages:
# rpm-ostree
- rpm-ostree nss-altfiles
# firmware updates
# If you're using linux-firmware, you probably also want fwupd
- fwupd

0 comments on commit 83542ad

Please sign in to comment.