@@ -27,6 +27,28 @@ ostree-layers:
27
27
- overlay/25azure-udev-rules
28
28
- overlay/30lvmdevices
29
29
30
+ conditional-include :
31
+ - if : releasever < 43
32
+ include :
33
+ packages :
34
+ # iptables-legacy was in <43 but excluded from 43+
35
+ # https://github.com/coreos/fedora-coreos-tracker/issues/1818
36
+ - iptables-legacy
37
+ postprocess :
38
+ # Default to iptables-nft. Otherwise, legacy wins. We can drop this once/if we
39
+ # remove iptables-legacy. This is needed because alternatives don't work
40
+ # https://github.com/coreos/fedora-coreos-tracker/issues/677
41
+ # https://github.com/coreos/fedora-coreos-tracker/issues/676
42
+ - |
43
+ #!/usr/bin/bash
44
+ set -eux -o pipefail
45
+ ln -sf /usr/sbin/ip6tables-nft /etc/alternatives/ip6tables
46
+ ln -sf /usr/sbin/ip6tables-nft-restore /etc/alternatives/ip6tables-restore
47
+ ln -sf /usr/sbin/ip6tables-nft-save /etc/alternatives/ip6tables-save
48
+ ln -sf /usr/sbin/iptables-nft /etc/alternatives/iptables
49
+ ln -sf /usr/sbin/iptables-nft-restore /etc/alternatives/iptables-restore
50
+ ln -sf /usr/sbin/iptables-nft-save /etc/alternatives/iptables-save
51
+
30
52
# Be minimal
31
53
recommends : false
32
54
@@ -71,20 +93,6 @@ postprocess:
71
93
set -eux -o pipefail
72
94
systemctl mask dnsmasq.service
73
95
74
- # Default to iptables-nft. Otherwise, legacy wins. We can drop this once/if we
75
- # remove iptables-legacy. This is needed because alternatives don't work
76
- # https://github.com/coreos/fedora-coreos-tracker/issues/677
77
- # https://github.com/coreos/fedora-coreos-tracker/issues/676
78
- - |
79
- #!/usr/bin/bash
80
- set -eux -o pipefail
81
- ln -sf /usr/sbin/ip6tables-nft /etc/alternatives/ip6tables
82
- ln -sf /usr/sbin/ip6tables-nft-restore /etc/alternatives/ip6tables-restore
83
- ln -sf /usr/sbin/ip6tables-nft-save /etc/alternatives/ip6tables-save
84
- ln -sf /usr/sbin/iptables-nft /etc/alternatives/iptables
85
- ln -sf /usr/sbin/iptables-nft-restore /etc/alternatives/iptables-restore
86
- ln -sf /usr/sbin/iptables-nft-save /etc/alternatives/iptables-save
87
-
88
96
# sudo prefers its config files to be mode 440, and some security scanners
89
97
# complain if /etc/sudoers.d files are world-readable.
90
98
# https://bugzilla.redhat.com/show_bug.cgi?id=1981979
@@ -164,9 +172,6 @@ packages:
164
172
- console-login-helper-messages-motdgen
165
173
# i18n
166
174
- kbd
167
- # In F35+ need `iptables-legacy` package
168
- # See https://github.com/coreos/fedora-coreos-tracker/issues/676#issuecomment-928028451
169
- - iptables-legacy
170
175
# NIC firmware we've traditionally shipped but then were split out of linux-firmware in Fedora
171
176
- qed-firmware # https://github.com/coreos/fedora-coreos-tracker/issues/1746
172
177
# Include udev rules for NVMe backed Azure Instances
0 commit comments