@@ -63,15 +63,15 @@ description: |
63
63
is_fedora = @host.operatingsystem.name == 'Fedora'
64
64
os_major = @host.operatingsystem.major.to_i
65
65
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
67
67
# safemode renderer does not support unary negation
68
68
proxy_uri = host_param('http-proxy') ? "http://#{host_param('http-proxy')}:#{host_param('http-proxy-port')}" : nil
69
69
proxy_string = proxy_uri ? " --proxy=#{proxy_uri}" : ''
70
70
puppet_enabled = !host_param_true?('skip-puppet-setup') && (host_puppet_server.present? || host_param_true?('force-puppet'))
71
71
salt_enabled = host_param('salt_master') ? true : false
72
72
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?
75
75
iface = @host.provision_interface
76
76
appstream_present = false
77
77
use_rhsm = (@host.operatingsystem.name == 'RedHat' || @host.operatingsystem.name == 'RHEL') && os_major >= 9
@@ -88,7 +88,7 @@ if plugin_present?('katello')
88
88
# Content Source: <%= @host.content_source %>
89
89
<% end -%>
90
90
91
- <% if (is_fedora && os_major < 29) || ( rhel_compatible && os_major <= 7) -%>
91
+ <% if rhel_compatible && os_major <= 7 -%>
92
92
install
93
93
<% end -%>
94
94
<%
@@ -138,7 +138,7 @@ rootpw --iscrypted <%= root_pass %>
138
138
<% if host_param_true?('disable-firewall') -%>
139
139
firewall --disable
140
140
<% else -%>
141
- firewall --<%= os_major >= 6 ? ' service=' : '' %> ssh
141
+ firewall --service=ssh
142
142
<% end -%>
143
143
<%# Kdump -%>
144
144
<% if host_param('kdump-options').present? -%>
@@ -178,16 +178,7 @@ realm join --one-time-password='<%= @host.otp || "$HOST[OTP]" %>' <%= @host.real
178
178
repo --name="Server-Mysql"
179
179
<% end -%>
180
180
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 -%>
186
181
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 -%>
191
182
192
183
<% if @dynamic -%>
193
184
%include /tmp/diskpart.cfg
@@ -339,11 +330,7 @@ cp -vf /tmp/*.pre.*.log /mnt/sysimage/root/
339
330
<%#
340
331
The last post section halts Anaconda to prevent endless loop in case HTTP request fails
341
332
%>
342
- <% if ( is_fedora && os_major < 20 ) || ( rhel_compatible && os_major < 7 ) -%>
343
- %post
344
- <% else -%>
345
333
%post --erroronfail --log=/root/install-callhome.post.log
346
- <% end -%>
347
334
348
335
<%= snippet 'eject_cdrom' -%>
349
336
0 commit comments