diff --git a/shared/macros/10-bash.jinja b/shared/macros/10-bash.jinja index 801ca354de7..4feaa7a0bdc 100644 --- a/shared/macros/10-bash.jinja +++ b/shared/macros/10-bash.jinja @@ -697,17 +697,14 @@ Macro to enable or disable a particular service. bash_service_command("enable", "bluetooth") bash_service_command("disable", "bluetooth.service") - bash_service_command("disable", "rsh.socket", xinetd="rsh") :param service_state: Desired state of the service :type service_state: str :param service: The service to change :type service: str -:param xinetd: Set the xinetd for the service. Defaults to empty string. -:type xinetd: str #}} -{{%- macro bash_service_command(service_state, service, xinetd="") -%}} +{{%- macro bash_service_command(service_state, service) -%}} {{# # If systemctl is installed, use systemctl command; otherwise, use the # service/chkconfig commands @@ -731,15 +728,6 @@ if /usr/bin/systemctl --failed | grep -q "{{{ service }}}"; then /usr/bin/systemctl reset-failed "{{{ service }}}" fi {{%- endif -%}} - -{{%- if xinetd != "" -%}} -grep -qi disable "/etc/xinetd.d/$xinetd" && \ - {{%- if service_state == "disable" -%}} -sed -i "s/disable.*/disable = no/gI" "/etc/xinetd.d/$xinetd" - {{%- else -%}} -sed -i "s/disable.*/disable = yes/gI" "/etc/xinetd.d/$xinetd" - {{%- endif -%}} -{{%- endif -%}} {{%- endmacro -%}}