From 8a78c1a1ce656b878b487b1a9f043200686440d8 Mon Sep 17 00:00:00 2001 From: Nick Burgan <13688219+nmburgan@users.noreply.github.com> Date: Tue, 13 Jan 2026 09:16:17 -0800 Subject: [PATCH] Add correct Java package metadata for redhatfips --- resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb b/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb index 26325301..b4f02648 100755 --- a/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb +++ b/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb @@ -170,7 +170,7 @@ options.java = 'java-17-amazon-corretto-headless' options.systemd = 1 options.systemd_el = 1 - elsif options.operating_system == :el + elsif options.operating_system == :el || options.operating_system == :redhatfips if options.os_version <= 7 raise "el version #{options.os_version} is no longer supported" elsif (8..9).include?(options.os_version) @@ -182,10 +182,6 @@ else fail "Unrecognized el os version #{options.os_version}" end - - options.systemd_el = 1 - elsif options.operating_system == :redhatfips && options.os_version >= 7 # systemd redhatfips - options.systemd = 1 options.systemd_el = 1 elsif options.operating_system == :sles options.systemd_sles = 1