Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't autoremove packages on dnf package uninstall #12389

Merged
merged 1 commit into from
Sep 18, 2024

Conversation

Mab879
Copy link
Member

@Mab879 Mab879 commented Sep 17, 2024

Description:

Ensure add --noautoremove for dnf uninstall.

Rationale:

Closes #12388

@Mab879 Mab879 added the Bash Bash remediation update. label Sep 17, 2024
@Mab879 Mab879 added this to the 0.1.75 milestone Sep 17, 2024
Copy link

Start a new ephemeral environment with changes proposed in this pull request:

rhel8 (from CTF) Environment (using Fedora as testing environment)
Open in Gitpod

Fedora Testing Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

Copy link

This datastream diff is auto generated by the check Compare DS/Generate Diff

Click here to see the full diff
bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_gdm_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_gdm_removed
+++ xccdf_org.ssgproject.content_rule_package_gdm_removed
@@ -8,9 +8,7 @@
 #	   system!
 
 if rpm -q --quiet "gdm" ; then
-
-    yum remove -y "gdm"
-
+yum remove -y "gdm"
 fi
 
 else

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-addon-ccpp_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "abrt-addon-ccpp" ; then
-
-    yum remove -y "abrt-addon-ccpp"
-
+yum remove -y "abrt-addon-ccpp"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-addon-kerneloops_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "abrt-addon-kerneloops" ; then
-
-    yum remove -y "abrt-addon-kerneloops"
-
+yum remove -y "abrt-addon-kerneloops"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-cli_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-cli_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-cli_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "abrt-cli" ; then
-
-    yum remove -y "abrt-cli"
-
+yum remove -y "abrt-cli"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-logger_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "abrt-plugin-logger" ; then
-
-    yum remove -y "abrt-plugin-logger"
-
+yum remove -y "abrt-plugin-logger"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-rhtsupport_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "abrt-plugin-rhtsupport" ; then
-
-    yum remove -y "abrt-plugin-rhtsupport"
-
+yum remove -y "abrt-plugin-rhtsupport"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt-plugin-sosreport_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "abrt-plugin-sosreport" ; then
-
-    yum remove -y "abrt-plugin-sosreport"
-
+yum remove -y "abrt-plugin-sosreport"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_geolite2-city_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_geolite2-city_removed
+++ xccdf_org.ssgproject.content_rule_package_geolite2-city_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "geolite2-city" ; then
-
-    yum remove -y "geolite2-city"
-
+yum remove -y "geolite2-city"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_geolite2-country_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_geolite2-country_removed
+++ xccdf_org.ssgproject.content_rule_package_geolite2-country_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "geolite2-country" ; then
-
-    yum remove -y "geolite2-country"
-
+yum remove -y "geolite2-country"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_gssproxy_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_gssproxy_removed
+++ xccdf_org.ssgproject.content_rule_package_gssproxy_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "gssproxy" ; then
-
-    yum remove -y "gssproxy"
-
+yum remove -y "gssproxy"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_iprutils_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_iprutils_removed
+++ xccdf_org.ssgproject.content_rule_package_iprutils_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "iprutils" ; then
-
-    yum remove -y "iprutils"
-
+yum remove -y "iprutils"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed
+++ xccdf_org.ssgproject.content_rule_package_krb5-workstation_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "krb5-workstation" ; then
-
-    yum remove -y "krb5-workstation"
-
+yum remove -y "krb5-workstation"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed
+++ xccdf_org.ssgproject.content_rule_package_libreport-plugin-logger_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "libreport-plugin-logger" ; then
-
-    yum remove -y "libreport-plugin-logger"
-
+yum remove -y "libreport-plugin-logger"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed
+++ xccdf_org.ssgproject.content_rule_package_libreport-plugin-rhtsupport_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "libreport-plugin-rhtsupport" ; then
-
-    yum remove -y "libreport-plugin-rhtsupport"
-
+yum remove -y "libreport-plugin-rhtsupport"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_pigz_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_pigz_removed
+++ xccdf_org.ssgproject.content_rule_package_pigz_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "pigz" ; then
-
-    yum remove -y "pigz"
-
+yum remove -y "pigz"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed
+++ xccdf_org.ssgproject.content_rule_package_python3-abrt-addon_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "python3-abrt-addon" ; then
-
-    yum remove -y "python3-abrt-addon"
-
+yum remove -y "python3-abrt-addon"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_tuned_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_tuned_removed
+++ xccdf_org.ssgproject.content_rule_package_tuned_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "tuned" ; then
-
-    yum remove -y "tuned"
-
+yum remove -y "tuned"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_iptables-services_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_iptables-services_removed
+++ xccdf_org.ssgproject.content_rule_package_iptables-services_removed
@@ -8,9 +8,7 @@
 #	   system!
 
 if rpm -q --quiet "iptables-services" ; then
-
-    yum remove -y "iptables-services"
-
+yum remove -y "iptables-services"
 fi
 
 else

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_mcstrans_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_mcstrans_removed
+++ xccdf_org.ssgproject.content_rule_package_mcstrans_removed
@@ -8,9 +8,7 @@
 #	   system!
 
 if rpm -q --quiet "mcstrans" ; then
-
-    yum remove -y "mcstrans"
-
+yum remove -y "mcstrans"
 fi
 
 else

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot-plugins_removed
@@ -8,9 +8,7 @@
 #	   system!
 
 if rpm -q --quiet "setroubleshoot-plugins" ; then
-
-    yum remove -y "setroubleshoot-plugins"
-
+yum remove -y "setroubleshoot-plugins"
 fi
 
 else

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot-server_removed
@@ -8,9 +8,7 @@
 #	   system!
 
 if rpm -q --quiet "setroubleshoot-server" ; then
-
-    yum remove -y "setroubleshoot-server"
-
+yum remove -y "setroubleshoot-server"
 fi
 
 else

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed
+++ xccdf_org.ssgproject.content_rule_package_setroubleshoot_removed
@@ -8,9 +8,7 @@
 #	   system!
 
 if rpm -q --quiet "setroubleshoot" ; then
-
-    yum remove -y "setroubleshoot"
-
+yum remove -y "setroubleshoot"
 fi
 
 else

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed
+++ xccdf_org.ssgproject.content_rule_package_avahi-autoipd_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "avahi-autoipd" ; then
-
-    yum remove -y "avahi-autoipd"
-
+yum remove -y "avahi-autoipd"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_avahi_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_avahi_removed
+++ xccdf_org.ssgproject.content_rule_package_avahi_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "avahi" ; then
-
-    yum remove -y "avahi"
-
+yum remove -y "avahi"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_abrt_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_abrt_removed
+++ xccdf_org.ssgproject.content_rule_package_abrt_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "abrt" ; then
-
-    yum remove -y "abrt"
-
+yum remove -y "abrt"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed
+++ xccdf_org.ssgproject.content_rule_package_inetutils-telnetd_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "inetutils-telnetd" ; then
-
-    yum remove -y "inetutils-telnetd"
-
+yum remove -y "inetutils-telnetd"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_nis_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_nis_removed
+++ xccdf_org.ssgproject.content_rule_package_nis_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "nis" ; then
-
-    yum remove -y "nis"
-
+yum remove -y "nis"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_ntpdate_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_ntpdate_removed
+++ xccdf_org.ssgproject.content_rule_package_ntpdate_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "ntpdate" ; then
-
-    yum remove -y "ntpdate"
-
+yum remove -y "ntpdate"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_telnetd-ssl_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_telnetd-ssl_removed
+++ xccdf_org.ssgproject.content_rule_package_telnetd-ssl_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "telnetd-ssl" ; then
-
-    yum remove -y "telnetd-ssl"
-
+yum remove -y "telnetd-ssl"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_telnetd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_telnetd_removed
+++ xccdf_org.ssgproject.content_rule_package_telnetd_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "telnetd" ; then
-
-    yum remove -y "telnetd"
-
+yum remove -y "telnetd"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_dhcp_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_dhcp_removed
+++ xccdf_org.ssgproject.content_rule_package_dhcp_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "dhcp-server" ; then
-
-    yum remove -y "dhcp-server"
-
+yum remove -y "dhcp-server"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_bind_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_bind_removed
+++ xccdf_org.ssgproject.content_rule_package_bind_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "bind" ; then
-
-    yum remove -y "bind"
-
+yum remove -y "bind"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_ftp_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_ftp_removed
+++ xccdf_org.ssgproject.content_rule_package_ftp_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "ftp" ; then
-
-    yum remove -y "ftp"
-
+yum remove -y "ftp"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_vsftpd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_vsftpd_removed
+++ xccdf_org.ssgproject.content_rule_package_vsftpd_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "vsftpd" ; then
-
-    yum remove -y "vsftpd"
-
+yum remove -y "vsftpd"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_httpd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_httpd_removed
+++ xccdf_org.ssgproject.content_rule_package_httpd_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "httpd" ; then
-
-    yum remove -y "httpd"
-
+yum remove -y "httpd"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_nginx_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_nginx_removed
+++ xccdf_org.ssgproject.content_rule_package_nginx_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "nginx" ; then
-
-    yum remove -y "nginx"
-
+yum remove -y "nginx"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_cyrus-imapd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_cyrus-imapd_removed
+++ xccdf_org.ssgproject.content_rule_package_cyrus-imapd_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "cyrus-imapd" ; then
-
-    yum remove -y "cyrus-imapd"
-
+yum remove -y "cyrus-imapd"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_dovecot_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_dovecot_removed
+++ xccdf_org.ssgproject.content_rule_package_dovecot_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "dovecot" ; then
-
-    yum remove -y "dovecot"
-
+yum remove -y "dovecot"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_krb5-server_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_krb5-server_removed
+++ xccdf_org.ssgproject.content_rule_package_krb5-server_removed
@@ -8,9 +8,7 @@
 #	   system!
 
 if rpm -q --quiet "krb5-server" ; then
-
-    yum remove -y "krb5-server"
-
+yum remove -y "krb5-server"
 fi
 
 else

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_389-ds-base_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_389-ds-base_removed
+++ xccdf_org.ssgproject.content_rule_package_389-ds-base_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "389-ds-base" ; then
-
-    yum remove -y "389-ds-base"
-
+yum remove -y "389-ds-base"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_openldap-clients_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_openldap-clients_removed
+++ xccdf_org.ssgproject.content_rule_package_openldap-clients_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "openldap-clients" ; then
-
-    yum remove -y "openldap-clients"
-
+yum remove -y "openldap-clients"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_openldap-servers_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_openldap-servers_removed
+++ xccdf_org.ssgproject.content_rule_package_openldap-servers_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "openldap-servers" ; then
-
-    yum remove -y "openldap-servers"
-
+yum remove -y "openldap-servers"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_sendmail_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_sendmail_removed
+++ xccdf_org.ssgproject.content_rule_package_sendmail_removed
@@ -8,9 +8,7 @@
 #	   system!
 
 if rpm -q --quiet "sendmail" ; then
-
-    yum remove -y "sendmail"
-
+yum remove -y "sendmail"
 fi
 
 else

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_nfs-utils_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_nfs-utils_removed
+++ xccdf_org.ssgproject.content_rule_package_nfs-utils_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "nfs-utils" ; then
-
-    yum remove -y "nfs-utils"
-
+yum remove -y "nfs-utils"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_rpcbind_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_rpcbind_removed
+++ xccdf_org.ssgproject.content_rule_package_rpcbind_removed
@@ -8,9 +8,7 @@
 #	   system!
 
 if rpm -q --quiet "rpcbind" ; then
-
-    yum remove -y "rpcbind"
-
+yum remove -y "rpcbind"
 fi
 
 else

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_rsync_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_rsync_removed
+++ xccdf_org.ssgproject.content_rule_package_rsync_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "rsync-daemon" ; then
-
-    yum remove -y "rsync-daemon"
-
+yum remove -y "rsync-daemon"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_xinetd_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_xinetd_removed
+++ xccdf_org.ssgproject.content_rule_package_xinetd_removed
@@ -8,9 +8,7 @@
 #	   system!
 
 if rpm -q --quiet "xinetd" ; then
-
-    yum remove -y "xinetd"
-
+yum remove -y "xinetd"
 fi
 
 else

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_ypbind_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_ypbind_removed
+++ xccdf_org.ssgproject.content_rule_package_ypbind_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "ypbind" ; then
-
-    yum remove -y "ypbind"
-
+yum remove -y "ypbind"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_ypserv_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_ypserv_removed
+++ xccdf_org.ssgproject.content_rule_package_ypserv_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "ypserv" ; then
-
-    yum remove -y "ypserv"
-
+yum remove -y "ypserv"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_rsh-server_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_rsh-server_removed
+++ xccdf_org.ssgproject.content_rule_package_rsh-server_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "rsh-server" ; then
-
-    yum remove -y "rsh-server"
-
+yum remove -y "rsh-server"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_rsh_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_rsh_removed
+++ xccdf_org.ssgproject.content_rule_package_rsh_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "rsh" ; then
-
-    yum remove -y "rsh"
-
+yum remove -y "rsh"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_talk-server_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_talk-server_removed
+++ xccdf_org.ssgproject.content_rule_package_talk-server_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "talk-server" ; then
-
-    yum remove -y "talk-server"
-
+yum remove -y "talk-server"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_talk_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_talk_removed
+++ xccdf_org.ssgproject.content_rule_package_talk_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "talk" ; then
-
-    yum remove -y "talk"
-
+yum remove -y "talk"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_telnet-server_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_telnet-server_removed
+++ xccdf_org.ssgproject.content_rule_package_telnet-server_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "telnet-server" ; then
-
-    yum remove -y "telnet-server"
-
+yum remove -y "telnet-server"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_telnet_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_telnet_removed
+++ xccdf_org.ssgproject.content_rule_package_telnet_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "telnet" ; then
-
-    yum remove -y "telnet"
-
+yum remove -y "telnet"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_tftp-server_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_tftp-server_removed
+++ xccdf_org.ssgproject.content_rule_package_tftp-server_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "tftp-server" ; then
-
-    yum remove -y "tftp-server"
-
+yum remove -y "tftp-server"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_tftp_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_tftp_removed
+++ xccdf_org.ssgproject.content_rule_package_tftp_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "tftp" ; then
-
-    yum remove -y "tftp"
-
+yum remove -y "tftp"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_cups_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_cups_removed
+++ xccdf_org.ssgproject.content_rule_package_cups_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "cups" ; then
-
-    yum remove -y "cups"
-
+yum remove -y "cups"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_squid_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_squid_removed
+++ xccdf_org.ssgproject.content_rule_package_squid_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "squid" ; then
-
-    yum remove -y "squid"
-
+yum remove -y "squid"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_freeradius_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_freeradius_removed
+++ xccdf_org.ssgproject.content_rule_package_freeradius_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "freeradius" ; then
-
-    yum remove -y "freeradius"
-
+yum remove -y "freeradius"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_quagga_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_quagga_removed
+++ xccdf_org.ssgproject.content_rule_package_quagga_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "quagga" ; then
-
-    yum remove -y "quagga"
-
+yum remove -y "quagga"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_samba_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_samba_removed
+++ xccdf_org.ssgproject.content_rule_package_samba_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "samba" ; then
-
-    yum remove -y "samba"
-
+yum remove -y "samba"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_net-snmp_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_net-snmp_removed
+++ xccdf_org.ssgproject.content_rule_package_net-snmp_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "net-snmp" ; then
-
-    yum remove -y "net-snmp"
-
+yum remove -y "net-snmp"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_openssh-server_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_openssh-server_removed
+++ xccdf_org.ssgproject.content_rule_package_openssh-server_removed
@@ -8,9 +8,7 @@
 #	   system!
 
 if rpm -q --quiet "openssh-server" ; then
-
-    yum remove -y "openssh-server"
-
+yum remove -y "openssh-server"
 fi
 
 else

bash remediation for rule 'xccdf_org.ssgproject.content_rule_package_xorg-x11-server-common_removed' differs.
--- xccdf_org.ssgproject.content_rule_package_xorg-x11-server-common_removed
+++ xccdf_org.ssgproject.content_rule_package_xorg-x11-server-common_removed
@@ -6,7 +6,5 @@
 #	   system!
 
 if rpm -q --quiet "xorg-x11-server-common" ; then
-
-    yum remove -y "xorg-x11-server-common"
-
+yum remove -y "xorg-x11-server-common"
 fi

bash remediation for rule 'xccdf_org.ssgproject.content_rule_xwindows_remove_packages' differs.
--- xccdf_org.ssgproject.content_rule_xwindows_remove_packages
+++ xccdf_org.ssgproject.content_rule_xwindows_remove_packages
@@ -2,23 +2,15 @@
 
 # remove packages
 if rpm -q --quiet "xorg-x11-server-Xorg" ; then
-
-    yum remove -y "xorg-x11-server-Xorg"
-
+yum remove -y "xorg-x11-server-Xorg"
 fi
 if rpm -q --quiet "xorg-x11-server-utils" ; then
-
-    yum remove -y "xorg-x11-server-utils"
-
+yum remove -y "xorg-x11-server-utils"
 fi
 if rpm -q --quiet "xorg-x11-server-common" ; then
-
-    yum remove -y "xorg-x11-server-common"
-
+yum remove -y "xorg-x11-server-common"
 fi
 
 if rpm -q --quiet "xorg-x11-server-Xwayland" ; then
-
-    yum remove -y "xorg-x11-server-Xwayland"
-
+yum remove -y "xorg-x11-server-Xwayland"
 fi

Copy link

🤖 A k8s content image for this PR is available at:
ghcr.io/complianceascode/k8scontent:12389
This image was built from commit: fd61dc2

Click here to see how to deploy it

If you alread have Compliance Operator deployed:
utils/build_ds_container.py -i ghcr.io/complianceascode/k8scontent:12389

Otherwise deploy the content and operator together by checking out ComplianceAsCode/compliance-operator and:
CONTENT_IMAGE=ghcr.io/complianceascode/k8scontent:12389 make deploy-local

Copy link

codeclimate bot commented Sep 17, 2024

Code Climate has analyzed commit fd61dc2 and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 100.0% (50% is the threshold).

This pull request will bring the total coverage in the repository to 59.5% (0.0% change).

View more on Code Climate.

@marcusburghardt marcusburghardt self-assigned this Sep 18, 2024
@marcusburghardt
Copy link
Member

Failure with xwindows_remove_packages is not related to this PR.
Reported issue #12394

Copy link
Member

@marcusburghardt marcusburghardt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@marcusburghardt marcusburghardt merged commit b2f8f74 into ComplianceAsCode:master Sep 18, 2024
97 of 100 checks passed
@Mab879 Mab879 deleted the fix_package_removed branch September 18, 2024 13:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bash Bash remediation update.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

package_*_removed removes too many packages on RHEL
2 participants