From 14c81fcaf03c5164fd5b9639b6853c0e26ae16cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ely=C3=A9zer=20Mendes=20Rezende?= Date: Mon, 23 Mar 2015 14:11:21 -0300 Subject: [PATCH] Better docker service restart Improve the check for the docker service in order to restart it if needed. Also check for systemd based system first and then fall back to the service based utilities. --- templates/rhsm-katello-reconfigure.erb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/templates/rhsm-katello-reconfigure.erb b/templates/rhsm-katello-reconfigure.erb index 65b8f9c0..496e8f39 100755 --- a/templates/rhsm-katello-reconfigure.erb +++ b/templates/rhsm-katello-reconfigure.erb @@ -71,9 +71,14 @@ if [ -d $CA_TRUST_ANCHORS ]; then cp $KATELLO_CERT_DIR/$KATELLO_CERT $CA_TRUST_ANCHORS update-ca-trust - #restart if docker service is installed - service docker status >/dev/null && \ + # restart docker if it is installed and running + if [ -f /usr/lib/systemd/system/docker.service ]; then + systemctl status docker >/dev/null && \ + systemctl restart docker >/dev/null 2&>1 + elif [ -f /etc/init.d/docker ]; then + service docker status >/dev/null && \ service docker restart >/dev/null 2&>1 + fi fi # restart goferd if it is installed and running