Skip to content

Commit

Permalink
Merge pull request coreos#507 from miabbott/inherit_network
Browse files Browse the repository at this point in the history
include `iproute-tc` in RHCOS
  • Loading branch information
openshift-merge-robot authored Feb 25, 2021
2 parents 349b5ec + d19631d commit 0522020
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
10 changes: 3 additions & 7 deletions manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ rojig:
include:
- fedora-coreos-config/manifests/ignition-and-ostree.yaml
- fedora-coreos-config/manifests/file-transfer.yaml
- fedora-coreos-config/manifests/networking-tools.yaml
# RHCOS owned packages
- rhcos-packages.yaml

Expand Down Expand Up @@ -186,8 +187,6 @@ exclude-packages:
# To verify, disable all repos except the ootpa ones and then comment
# out the bottom and run `coreos-assembler build`.
packages:
# Dependency of iscsi
- hostname
# For growing root partition
- cloud-utils-growpart
# Contains SCTP (https://bugzilla.redhat.com/show_bug.cgi?id=1718049)
Expand All @@ -213,24 +212,21 @@ packages:
# Networking
- nfs-utils
- openvswitch2.13
- NetworkManager dnsmasq
- dnsmasq
- NetworkManager-ovs
- NetworkManager-team teamd
- lvm2 iscsi-initiator-utils sg3_utils
- device-mapper-multipath
- xfsprogs e2fsprogs mdadm
- cryptsetup
- cifs-utils
# Interactive Networking configuration during coreos-install
- NetworkManager-tui
# Time sync
- chrony
# Extra runtime
- logrotate
- sssd shadow-utils
# Common tools used by scripts and admins interactively
- sudo coreutils less tar xz gzip bzip2 rsync tmux jq
- nmap-ncat net-tools bind-utils strace
- nmap-ncat strace
- bash-completion
# Editors
- vim-minimal nano
Expand Down

0 comments on commit 0522020

Please sign in to comment.