Skip to content

Remove unused xinetd parameter from bash_service_command macro #15027

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.

Sign up for GitHub

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

Open
ggbecker wants to merge 1 commit into
base: master
Choose a base branch
from
+1 −13
Open

Remove unused xinetd parameter from bash_service_command macro #15027

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions shared/macros/10-bash.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 -%}}


Expand Down
Loading