diff --git a/SOURCES/network-pr353.diff b/SOURCES/network-pr353.diff new file mode 100644 index 0000000..e4398b7 --- /dev/null +++ b/SOURCES/network-pr353.diff @@ -0,0 +1,35 @@ +From f4fabea55429077c2a4e94fe8015c4ab57f58ff3 Mon Sep 17 00:00:00 2001 +From: Fernando Fernandez Mancera +Date: Mon, 15 Feb 2021 11:02:55 +0100 +Subject: [PATCH] README: remove "slaves" leftover from documentation + +Signed-off-by: Fernando Fernandez Mancera +--- + README.md | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/README.md b/README.md +index 6b15673..06a8b1b 100644 +--- a/README.md ++++ b/README.md +@@ -300,7 +300,7 @@ different or the profile may not be tied to an interface at all. + + The `zone` option sets the firewalld zone for the interface. + +-Slaves to the bridge, bond or team devices cannot specify a zone. ++Ports to the bridge, bond or team devices cannot specify a zone. + + + ### `ip` +@@ -367,7 +367,7 @@ The IP configuration supports the following options: + + **Note:** When `route_append_only` or `rule_append_only` is not specified, the `network` role deletes the current routes or routing rules. + +-**Note:** Slaves to the bridge, bond or team devices cannot specify `ip` settings. ++**Note:** Ports to the bridge, bond or team devices cannot specify `ip` settings. + + ### `ethtool` + +-- +2.29.2 + diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec index f0b2a24..bea841e 100644 --- a/SPECS/rhel-system-roles.spec +++ b/SPECS/rhel-system-roles.spec @@ -12,7 +12,7 @@ Name: linux-system-roles Url: https://github.com/linux-system-roles/ Summary: Set of interfaces for unified system management Version: 1.0.0 -Release: 31%{?dist} +Release: 32%{?dist} #Group: Development/Libraries License: GPLv3+ and MIT and BSD @@ -207,6 +207,7 @@ Patch51: network-epel-minimal.diff Patch52: network-permissions.diff Patch53: network-tier1-tags.diff Patch55: network-disable-bondtests.diff +Patch56: network-pr353.diff Patch62: storage-partition-name.diff Patch63: storage-no-disks-existing.diff @@ -281,6 +282,7 @@ cd %{rolename5} %patch52 -p1 %patch53 -p1 %patch55 -p1 +%patch56 -p1 cd .. cd %{rolename6} %patch62 -p1 @@ -710,6 +712,10 @@ cd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/ %{ansible_collection_files} %changelog +* Tue Feb 23 2021 Fernando Fernandez Mancera - 1.0.0-32 +- Add patch for the inclusive language leftover on network-role README.md, + Resolves rhbz#1931931 + * Mon Feb 22 2021 Pavel Cahyna - 1.0.0-31 - Rebase certificate role to pick up a test fix, Resolves rhbz#1931568 - Rebase logging role to fix default private key path,