Skip to content

Commit 64bf0dd

Browse files
committed
Fixes #38647: kickstart default drop EOL conditions
Remove conditions related to EOL OSes (EL5/6, Fedora < 16/19/28)
1 parent 19bc9ad commit 64bf0dd

File tree

1 file changed

+5
-18
lines changed

1 file changed

+5
-18
lines changed

app/views/unattended/provisioning_templates/provision/kickstart_default.erb

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ description: |
6363
is_fedora = @host.operatingsystem.name == 'Fedora'
6464
os_major = @host.operatingsystem.major.to_i
6565
os_minor = @host.operatingsystem.minor.to_i
66-
realm_compatible = (@host.operatingsystem.name == 'Fedora' && os_major >= 20) || (rhel_compatible && os_major >= 7)
66+
realm_compatible = (@host.operatingsystem.name == 'Fedora' && os_major >= 20) || rhel_compatible
6767
# safemode renderer does not support unary negation
6868
proxy_uri = host_param('http-proxy') ? "http://#{host_param('http-proxy')}:#{host_param('http-proxy-port')}" : nil
6969
proxy_string = proxy_uri ? " --proxy=#{proxy_uri}" : ''
7070
puppet_enabled = !host_param_true?('skip-puppet-setup') && (host_puppet_server.present? || host_param_true?('force-puppet'))
7171
salt_enabled = host_param('salt_master') ? true : false
7272
chef_enabled = @host.respond_to?(:chef_proxy) && @host.chef_proxy
73-
section_end = (rhel_compatible && os_major <= 5) ? '' : '%end'
74-
use_ntp = host_param_true?('use-ntp', (is_fedora && os_major < 16) || (rhel_compatible && os_major <= 6))
73+
section_end = '%end'
74+
use_ntp = host_param_true?
7575
iface = @host.provision_interface
7676
appstream_present = false
7777
use_rhsm = (@host.operatingsystem.name == 'RedHat' || @host.operatingsystem.name == 'RHEL') && os_major >= 9
@@ -88,7 +88,7 @@ if plugin_present?('katello')
8888
# Content Source: <%= @host.content_source %>
8989
<% end -%>
9090

91-
<% if (is_fedora && os_major < 29) || (rhel_compatible && os_major <= 7) -%>
91+
<% if rhel_compatible && os_major <= 7 -%>
9292
install
9393
<% end -%>
9494
<%
@@ -138,7 +138,7 @@ rootpw --iscrypted <%= root_pass %>
138138
<% if host_param_true?('disable-firewall') -%>
139139
firewall --disable
140140
<% else -%>
141-
firewall --<%= os_major >= 6 ? 'service=' : '' %>ssh
141+
firewall --service=ssh
142142
<% end -%>
143143
<%# Kdump -%>
144144
<% if host_param('kdump-options').present? -%>
@@ -178,16 +178,7 @@ realm join --one-time-password='<%= @host.otp || "$HOST[OTP]" %>' <%= @host.real
178178
repo --name="Server-Mysql"
179179
<% end -%>
180180

181-
<% if @host.operatingsystem.name == 'Fedora' && os_major <= 16 -%>
182-
# Bootloader exception for Fedora 16:
183-
bootloader --append="<%= host_param('bootloader-append') || 'nofb quiet splash=quiet' %> <%= ks_console %>" <%= grub_pass %>
184-
part biosboot --fstype=biosboot --size=1
185-
<% else -%>
186181
bootloader --location=mbr --append="<%= host_param('bootloader-append') || 'nofb quiet splash=quiet' %>" <%= grub_pass %>
187-
<% if os_major == 5 -%>
188-
key --skip
189-
<% end -%>
190-
<% end -%>
191182

192183
<% if @dynamic -%>
193184
%include /tmp/diskpart.cfg
@@ -339,11 +330,7 @@ cp -vf /tmp/*.pre.*.log /mnt/sysimage/root/
339330
<%#
340331
The last post section halts Anaconda to prevent endless loop in case HTTP request fails
341332
%>
342-
<% if (is_fedora && os_major < 20) || (rhel_compatible && os_major < 7) -%>
343-
%post
344-
<% else -%>
345333
%post --erroronfail --log=/root/install-callhome.post.log
346-
<% end -%>
347334

348335
<%= snippet 'eject_cdrom' -%>
349336

0 commit comments

Comments
 (0)